Remove withAdaptivity

src/components/ActionSheet/ActionSheet.e2e.tsx

@@ -3,10 +3,10 @@ import { ActionSheet, ActionSheetProps } from "./ActionSheet";
 import { ActionSheetItem } from "../ActionSheetItem/ActionSheetItem";
 import { describeScreenshotFuzz } from "../../testing/e2e/utils";
 import { withPlatform } from "../../hoc/withPlatform";
-import { ViewWidth, SizeType } from "../../hoc/withAdaptivity";
 import { HasPlatform } from "../../types";
 import { VKCOM } from "../../lib/platform";
 import { TooltipContainer } from "../Tooltip/TooltipContainer";
+import { ViewWidth, SizeType } from "../AdaptivityProvider/AdaptivityContext";
 
 describe("ActionSheet", () => {
   const cancel = <ActionSheetItem mode="cancel">Отменить</ActionSheetItem>;

src/components/ActionSheet/ActionSheet.test.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from "@testing-library/react";
-import { ViewWidth } from "../../hoc/withAdaptivity";
+import { ViewWidth } from "../AdaptivityProvider/AdaptivityContext";
 import {
   baselineComponent,
   waitForPopper,

src/components/Alert/Alert.test.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { AdaptivityProvider } from "../AdaptivityProvider/AdaptivityProvider";
-import { ViewWidth } from "../../hoc/withAdaptivity";
+import { ViewWidth } from "../AdaptivityProvider/AdaptivityContext";
 import { baselineComponent, runAllTimers } from "../../testing/utils";
 import { Alert } from "./Alert";
 import { ANDROID, IOS } from "../../lib/platform";

src/components/Alert/Alert.tsx

@@ -4,7 +4,6 @@ import { PopoutWrapper } from "../PopoutWrapper/PopoutWrapper";
 import { getClassName } from "../../helpers/getClassName";
 import { classNames } from "../../lib/classNames";
 import { ANDROID, VKCOM, IOS } from "../../lib/platform";
-import { ViewWidth } from "../../hoc/withAdaptivity";
 import { Button, ButtonProps } from "../Button/Button";
 import { hasReactNode, stopPropagation } from "../../lib/utils";
 import { Headline } from "../Typography/Headline/Headline";
@@ -16,6 +15,7 @@ import { useScrollLock } from "../AppRoot/ScrollContext";
 import { useWaitTransitionFinish } from "../../hooks/useWaitTransitionFinish";
 import { usePlatform } from "../../hooks/usePlatform";
 import { useAdaptivity } from "../../hooks/useAdaptivity";
+import { ViewWidth } from "../AdaptivityProvider/AdaptivityContext";
 import "./Alert.css";
 
 export type AlertActionInterface = AlertAction &

src/components/AppRoot/AppRoot.test.tsx

@@ -2,7 +2,7 @@ import { render } from "@testing-library/react";
 import { baselineComponent } from "../../testing/utils";
 import { AppRootContext } from "./AppRootContext";
 import { AppRoot } from "./AppRoot";
-import { SizeType } from "../../hoc/withAdaptivity";
+import { SizeType } from "../AdaptivityProvider/AdaptivityContext";
 import { AdaptivityProvider } from "../../components/AdaptivityProvider/AdaptivityProvider";
 
 describe("AppRoot", () => {

src/components/Banner/Banner.test.tsx

@@ -1,7 +1,9 @@
 import { screen, render } from "@testing-library/react";
-import { AdaptivityProps } from "../../hoc/withAdaptivity";
+import {
+  AdaptivityProps,
+  SizeType,
+} from "../AdaptivityProvider/AdaptivityContext";
 import { baselineComponent } from "../../testing/utils";
-import { SizeType } from "../AdaptivityProvider/AdaptivityContext";
 import { AdaptivityProvider } from "../AdaptivityProvider/AdaptivityProvider";
 import Banner, { BannerProps } from "./Banner";
 

src/components/CalendarHeader/CalendarHeader.tsx

@@ -9,7 +9,7 @@ import Tappable from "../Tappable/Tappable";
 import { classNames } from "../../lib/classNames";
 import { SelectType } from "../Select/Select";
 import { CustomSelect } from "../CustomSelect/CustomSelect";
-import { SizeType } from "../../hoc/withAdaptivity";
+import { SizeType } from "../AdaptivityProvider/AdaptivityContext";
 import { getMonths, getYears } from "../../lib/calendar";
 import { LocaleProviderContext } from "../LocaleProviderContext/LocaleProviderContext";
 import { Paragraph } from "../Typography/Paragraph/Paragraph";

src/components/CalendarTime/CalendarTime.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { setHours, setMinutes } from "../../lib/date";
 import { CustomSelect } from "../CustomSelect/CustomSelect";
 import { Button } from "../Button/Button";
-import { SizeType } from "../../hoc/withAdaptivity";
+import { SizeType } from "../AdaptivityProvider/AdaptivityContext";
 import { AdaptivityProvider } from "../AdaptivityProvider/AdaptivityProvider";
 import "./CalendarTime.css";
 

src/components/CustomSelect/CustomSelect.e2e.tsx

@@ -1,10 +1,10 @@
 import { describeScreenshotFuzz } from "../../testing/e2e/utils";
-import { CustomSelect, CustomSelectProps } from "../CustomSelect/CustomSelect";
+import { CustomSelect, SelectProps } from "../CustomSelect/CustomSelect";
 import { SelectType } from "../Select/Select";
 
 describe("CustomSelect", () => {
   describeScreenshotFuzz(
-    (props: CustomSelectProps) => (
+    (props: SelectProps) => (
       <CustomSelect
         placeholder="Не выбрана"
         {...props}

src/components/CustomSelect/CustomSelect.tsx

@@ -89,7 +89,7 @@ interface CustomSelectState {
   popperPlacement?: Placement;
 }
 
-export interface CustomSelectProps
+export interface SelectProps
   extends NativeSelectProps,
     HasPlatform,
     FormFieldProps {
@@ -151,10 +151,10 @@ export interface CustomSelectProps
 type MouseEventHandler = (event: React.MouseEvent<HTMLElement>) => void;
 
 class CustomSelectComponent extends React.Component<
-  CustomSelectProps,
+  SelectProps,
   CustomSelectState
 > {
-  static defaultProps: Partial<CustomSelectProps> = {
+  static defaultProps: Partial<SelectProps> = {
     searchable: false,
     renderOption({ option, ...props }): React.ReactNode {
       return <CustomSelectOption {...props} />;
@@ -167,7 +167,7 @@ class CustomSelectComponent extends React.Component<
     fixDropdownWidth: true,
   };
 
-  public constructor(props: CustomSelectProps) {
+  public constructor(props: SelectProps) {
     super(props);
 
     const { value, defaultValue } = props;
@@ -221,9 +221,9 @@ class CustomSelectComponent extends React.Component<
   }
 
   filter = (
-    options: CustomSelectProps["options"],
+    options: SelectProps["options"],
     inputValue: string,
-    filterFn: CustomSelectProps["filterFn"]
+    filterFn: SelectProps["filterFn"]
   ) => {
     return typeof filterFn === "function"
       ? options.filter((option) => filterFn(inputValue, option))
@@ -543,7 +543,7 @@ class CustomSelectComponent extends React.Component<
 
   handleKeyUp = debounce(this.resetKeyboardInput, 1000);
 
-  componentDidUpdate(prevProps: CustomSelectProps) {
+  componentDidUpdate(prevProps: SelectProps) {
     // Внутри useEffect и так is, можно убрать
     if (
       !is(prevProps.value, this.props.value) ||

src/components/CustomSelectOption/CustomSelectOption.e2e.tsx

@@ -1,7 +1,7 @@
 import { CustomSelectOption } from "./CustomSelectOption";
 import { describeScreenshotFuzz } from "../../testing/e2e/utils";
 import Avatar from "../Avatar/Avatar";
-import { SizeType } from "../../hoc/withAdaptivity";
+import { SizeType } from "../AdaptivityProvider/AdaptivityContext";
 
 describe("CustomSelectOption", () => {
   describeScreenshotFuzz(

src/components/DatePicker/DatePicker.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Input } from "../Input/Input";
-import { withAdaptivity, AdaptivityProps } from "../../hoc/withAdaptivity";
+import { useAdaptivity } from "../../hooks/useAdaptivity";
 import { HasPlatform } from "../../types";
 import { leadingZero } from "../../lib/utils";
 import { CustomSelect } from "../CustomSelect/CustomSelect";
@@ -32,8 +32,7 @@ export interface DatePickerProps
       React.HTMLAttributes<HTMLDivElement>,
       "defaultValue" | "min" | "max"
     >,
-    HasPlatform,
-    AdaptivityProps {
+    HasPlatform {
   min?: DatePickerDateFormat;
   max?: DatePickerDateFormat;
   name?: string;
@@ -91,7 +90,6 @@ const DatePickerCustom: React.FC<
   yearPlaceholder,
   popupDirection,
   defaultValue,
-  hasMouse,
   monthNames,
   day = 0,
   month = 0,
@@ -177,7 +175,6 @@ const DatePickerNative: React.FC<
   yearPlaceholder,
   popupDirection,
   defaultValue,
-  hasMouse,
   day,
   month,
   year,
@@ -210,11 +207,8 @@ const DatePickerNative: React.FC<
 /**
  * @see https://vkcom.github.io/VKUI/#/DatePicker
  */
-const DatePicker: React.FC<DatePickerProps> = ({
-  hasMouse,
-  defaultValue,
-  ...props
-}) => {
+const DatePicker: React.FC<DatePickerProps> = ({ defaultValue, ...props }) => {
+  const { hasMouse } = useAdaptivity();
   const [value, setValue] = React.useState<Partial<DatePickerDateFormat>>(
     () => ({
       day: defaultValue?.day || 0,
@@ -236,6 +230,4 @@ const DatePicker: React.FC<DatePickerProps> = ({
 };
 
 // eslint-disable-next-line import/no-default-export
-export default withAdaptivity(DatePicker, {
-  hasMouse: true,
-});
+export default DatePicker;

src/components/Epic/Epic.test.tsx

@@ -1,6 +1,6 @@
 import { noop } from "../../lib/utils";
 import { baselineComponent } from "../../testing/utils";
-import Epic from "./Epic";
+import { Epic } from "./Epic";
 
 describe("Epic", () => {
   beforeAll(() => {

src/components/Epic/Epic.tsx

@@ -1,19 +1,14 @@
 import * as React from "react";
 import { getClassName } from "../../helpers/getClassName";
 import { usePlatform } from "../../hooks/usePlatform";
-import { withAdaptivity, ViewWidth } from "../../hoc/withAdaptivity";
+import { useAdaptivity } from "../../hooks/useAdaptivity";
 import { ScrollSaver } from "./ScrollSaver";
 import { getNavId } from "../../lib/getNavId";
 import { warnOnce } from "../../lib/warnOnce";
-import {
-  AdaptivityContextInterface,
-  AdaptivityProps,
-} from "../AdaptivityProvider/AdaptivityContext";
+import { ViewWidth } from "../AdaptivityProvider/AdaptivityContext";
 import "./Epic.css";
 
-export interface EpicProps
-  extends React.HTMLAttributes<HTMLDivElement>,
-    AdaptivityProps {
+export interface EpicProps extends React.HTMLAttributes<HTMLDivElement> {
   tabbar?: React.ReactNode;
   activeStory: string;
 }
@@ -23,12 +18,11 @@ const warn = warnOnce("Epic");
 /**
  * @see https://vkcom.github.io/VKUI/#/Epic
  */
-export const Epic: React.FC<EpicProps & AdaptivityContextInterface> = (
-  props
-) => {
+export const Epic: React.FC<EpicProps> = (props) => {
   const platform = usePlatform();
+  const { viewWidth } = useAdaptivity();
   const scroll = React.useRef<{ [key: string]: number }>({}).current;
-  const { activeStory, tabbar, children, viewWidth, ...restProps } = props;
+  const { activeStory, tabbar, children, ...restProps } = props;
 
   if (
     process.env.NODE_ENV === "development" &&
@@ -59,8 +53,3 @@ export const Epic: React.FC<EpicProps & AdaptivityContextInterface> = (
     </div>
   );
 };
-
-// eslint-disable-next-line import/no-default-export
-export default withAdaptivity(Epic, {
-  viewWidth: true,
-});