добавлен vanilla popper, удален react-popper из проекта

package.json

@@ -26,7 +26,7 @@
     "@types/uuid": "^8.*",
     "@viewstools/use-masked-input": "^2.*",
     "@worksolutions/ckeditor5": "0.0.3",
-    "@worksolutions/react-utils": "^1.2.65",
+    "@worksolutions/react-utils": "^1.2.67",
     "@worksolutions/utils": "^1.2.30",
     "external-svg-sprite-loader": "^6.*",
     "history": "^4.*",
@@ -40,7 +40,6 @@
     "re-resizable": "^6.9.0",
     "react": "^17.*",
     "react-dom": "^17.*",
-    "react-popper": "^2.1.0",
     "react-router-dom": "^5.*",
     "react-transition-group": "^4.4.1",
     "react-use": "^17.2.4",

src/css/common.scss

@@ -2,3 +2,4 @@
   box-sizing: border-box;
   line-height: 0;
 }
+

src/primitives/Popper/Manager/index.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import { useMountedState } from "react-use";
+
+export const ManagerReferenceNodeContext = React.createContext<HTMLElement>(null!);
+export const ManagerReferenceNodeSetterContext = React.createContext<(elem: HTMLElement) => void>(null!);
+
+export function Manager({ children }: React.PropsWithChildren<{}>) {
+  const [referenceNode, setReferenceNode] = React.useState<HTMLElement>(null!);
+  const isMounted = useMountedState();
+
+  const handleSetReferenceNode = React.useCallback((node) => isMounted() && setReferenceNode(node), [isMounted]);
+
+  return (
+    <ManagerReferenceNodeContext.Provider value={referenceNode}>
+      <ManagerReferenceNodeSetterContext.Provider value={handleSetReferenceNode}>
+        {children}
+      </ManagerReferenceNodeSetterContext.Provider>
+    </ManagerReferenceNodeContext.Provider>
+  );
+}

src/primitives/Popper/Popper/index.tsx

@@ -0,0 +1,99 @@
+import React, { Ref } from "react";
+import { provideRef, useVanillaPopper } from "@worksolutions/react-utils";
+import { Modifier, Options, Placement, PositioningStrategy, State } from "@popperjs/core/lib";
+
+import { ManagerReferenceNodeContext } from "../Manager";
+
+import { getFirstIfArray } from "../utils";
+
+type ReferenceElement = HTMLElement;
+
+export interface PopperArrowProps {
+  ref: React.Ref<any>;
+  style?: Partial<CSSStyleDeclaration | null>;
+}
+
+export type PopperChildrenProps = {
+  ref: Ref<any>;
+  style?: Partial<CSSStyleDeclaration | undefined>;
+  placement: Placement;
+  isReferenceHidden?: boolean | null;
+  hasPopperEscaped?: boolean | null;
+  update: (() => Promise<Partial<State>>) | null;
+  forceUpdate: () => void;
+  arrowProps: PopperArrowProps;
+};
+
+type Modifiers = Array<Partial<Modifier<any, any>>>;
+export type PopperChildren = (popperChildrenProps: PopperChildrenProps) => React.ReactNode;
+
+export type PopperProps = {
+  children: PopperChildren;
+  innerRef?: Ref<any>;
+  modifiers?: Modifiers;
+  placement?: Placement;
+  strategy?: PositioningStrategy;
+  referenceElement?: ReferenceElement;
+  onFirstUpdate?: (arg0: Partial<State>) => void;
+};
+
+const noop: any = () => {};
+const noopPromise: any = () => Promise.resolve(null);
+const EMPTY_MODIFIERS: Modifiers = [];
+
+export function Popper({
+  placement = "bottom",
+  strategy = "absolute",
+  modifiers = EMPTY_MODIFIERS,
+  referenceElement,
+  onFirstUpdate,
+  innerRef,
+  children,
+}: PopperProps) {
+  const referenceNode = React.useContext(ManagerReferenceNodeContext);
+
+  const [popperElement, setPopperElement] = React.useState(null);
+  const [arrowElement, setArrowElement] = React.useState(null);
+
+  React.useEffect(() => {
+    provideRef(innerRef)(popperElement!);
+  }, [innerRef, popperElement]);
+
+  const options: Options = React.useMemo(
+    () => ({
+      placement,
+      strategy,
+      onFirstUpdate,
+      modifiers: [
+        ...modifiers,
+        {
+          name: "arrow",
+          enabled: arrowElement != null,
+          options: { element: arrowElement },
+        },
+      ],
+    }),
+    [placement, strategy, onFirstUpdate, modifiers, arrowElement],
+  );
+
+  const { state, forceUpdate, update } = useVanillaPopper(referenceElement || referenceNode, popperElement, options);
+
+  const childrenProps: PopperChildrenProps = React.useMemo(
+    () => ({
+      ref: setPopperElement,
+      style: state?.styles?.popper,
+      placement: state ? state.placement : placement,
+      hasPopperEscaped: state && state.modifiersData.hide ? state.modifiersData.hide.hasPopperEscaped : null,
+      isReferenceHidden: state && state.modifiersData.hide ? state.modifiersData.hide.isReferenceHidden : null,
+      arrowProps: {
+        style: state?.styles?.arrow,
+        ref: setArrowElement,
+      },
+      forceUpdate: forceUpdate || noop,
+      update: update || noopPromise,
+    }),
+    [setPopperElement, setArrowElement, placement, state, update, forceUpdate],
+  );
+
+  return getFirstIfArray(children)(childrenProps);
+}

src/primitives/Popper/Reference/index.ts

@@ -0,0 +1,32 @@
+import React, { Ref } from "react";
+import { provideRef } from "@worksolutions/react-utils";
+
+import { getFirstIfArray } from "../utils";
+import { ManagerReferenceNodeSetterContext } from "../Manager";
+
+export type ReferenceChildrenProps = { ref: Ref<any> };
+export type ReferenceProps = {
+  children: (ReferenceChildrenProps: ReferenceChildrenProps) => React.ReactNode;
+  innerRef?: Ref<any>;
+};
+
+export function Reference({ children, innerRef }: ReferenceProps) {
+  const setReferenceNode = React.useContext(ManagerReferenceNodeSetterContext);
+
+  const refHandler = React.useCallback(
+    (node?: HTMLElement) => {
+      if (!node) return;
+      provideRef(innerRef)(node);
+      setReferenceNode(node);
+    },
+    [innerRef, setReferenceNode],
+  );
+
+  React.useEffect(() => () => provideRef(innerRef)(null!), []);
+
+  React.useEffect(() => {
+    console.warn("`Reference` should not be used outside of a `Manager` component.");
+  }, [setReferenceNode]);
+
+  return getFirstIfArray(children)({ ref: refHandler });
+}

src/primitives/Popper/utils.ts

@@ -0,0 +1 @@
+export const getFirstIfArray = <T>(arg: T | T[]): T => (Array.isArray(arg) ? arg[0] : arg);

src/primitives/PopupManager/PopperElement/Arrow.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo } from "react";
-import { PopperArrowProps } from "react-popper";
 import { Placement } from "@popperjs/core/lib/enums";
 
+import { PopperArrowProps } from "primitives/Popper/Popper";
 import Wrapper from "../../Wrapper";
 
 import { bottom, boxShadow, child, left, right, top, transform, zIndex } from "../../../styles";
@@ -40,8 +40,6 @@ interface PopupArrowInterface {
 }
 
 function Arrow({ arrowProps, placement }: PopupArrowInterface) {
-  return null;
-
   const arrowPopperStyles = useCallback(() => reactStylesToStylesComponent(arrowProps.style), [arrowProps.style]);
   const arrowPositionStyles = useMemo(() => getArrowPositionStyles(placement), [placement]);
   const arrowStyles = useMemo(() => getArrowStyles(placement), [placement]);

src/primitives/PopupManager/PopperElement/PopperElementChildrenWrapper.tsx

@@ -1,14 +1,15 @@
 import React, { Ref, useEffect } from "react";
 import { Placement } from "@popperjs/core/lib/enums";
 import { useEffectSkipFirst } from "@worksolutions/react-utils";
-import { PopperArrowProps } from "react-popper";
+
+import { PopperArrowProps } from "primitives/Popper/Popper";
 
 import Wrapper from "../../Wrapper";
 import Arrow from "./Arrow";
 
 interface PopperChildrenProps {
   styles?: any;
-  style: React.CSSProperties;
+  style: CSSStyleDeclaration;
   placement: Placement;
   children: React.ReactNode;
   hasArrow?: boolean;
@@ -23,6 +24,7 @@ function PopperElementChildrenWrapper(
 ) {
   useEffectSkipFirst(update, [update, hasArrow]);
 
+  useEffect(update, []);
   useEffect(() => {
     if (!triggerElement) return () => {};
 

src/primitives/PopupManager/PopperElement/index.tsx

@@ -2,8 +2,10 @@ import React, { Ref, useMemo } from "react";
 import { Placement } from "@popperjs/core/lib/enums";
 import { PositioningStrategy } from "@popperjs/core";
 import popperMaxSizeModifier from "popper-max-size-modifier";
+import { Modifier } from "@popperjs/core/lib";
+
+import { Popper } from "primitives/Popper/Popper";
 
-import { Modifier, Popper as ReactPopper } from "react-popper";
 import { zIndex_popup } from "../../../constants/zIndexes";
 import PopperElementChildrenWrapper from "./PopperElementChildrenWrapper";
 import { popupArrowSize } from "./Arrow";
@@ -12,8 +14,12 @@ const commonPopperStyles = [zIndex_popup];
 
 const modifierArrowPadding = 12;
 
-function getModifiers(offset?: number): Modifier<string>[] {
+function getModifiers(offset?: number): Partial<Modifier<any, any>>[] {
   return [
+    {
+      name: "flip",
+      enabled: true,
+    },
     {
       name: "arrow",
       options: {
@@ -70,22 +76,24 @@ function PopperElement(
   const popperModifiers = useMemo(() => getModifiers(offset), [offset]);
 
   return (
-    <ReactPopper placement={primaryPlacement} modifiers={popperModifiers} strategy={strategy} innerRef={ref}>
-      {({ ref, style, placement, arrowProps, update }) => (
-        <PopperElementChildrenWrapper
-          ref={ref}
-          style={style}
-          styles={[commonPopperStyles, styles]}
-          placement={placement}
-          arrowProps={arrowProps}
-          hasArrow={hasArrow}
-          update={update}
-          triggerElement={triggerElement}
-        >
-          {children}
-        </PopperElementChildrenWrapper>
-      )}
-    </ReactPopper>
+    <Popper placement={primaryPlacement} modifiers={popperModifiers} strategy={strategy} innerRef={ref}>
+      {({ ref, style, placement, arrowProps, update }) => {
+        return (
+          <PopperElementChildrenWrapper
+            ref={ref}
+            style={style}
+            styles={[commonPopperStyles, styles]}
+            placement={placement}
+            arrowProps={arrowProps}
+            hasArrow={hasArrow}
+            update={update}
+            triggerElement={triggerElement}
+          >
+            {children}
+          </PopperElementChildrenWrapper>
+        );
+      }}
+    </Popper>
   );
 }
 

src/primitives/PopupManager/PopupManagers/PopupManagerForClick.tsx

@@ -1,8 +1,10 @@
 import React from "react";
-import { Manager as ReactPopperManager, Reference as ReactPopperReference } from "react-popper";
 import { provideRef } from "@worksolutions/react-utils";
 import { observer } from "mobx-react-lite";
 
+import { Reference } from "primitives/Popper/Reference";
+import { Manager } from "primitives/Popper/Manager";
+
 import VisibilityManager, { VisibilityManagerContextInterface } from "../../VisibilityManager";
 import { SetVisibilityContextAndTriggerRef } from "./types";
 
@@ -27,14 +29,14 @@ function PopupManagerForClick({
   const Element = React.useCallback(
     (context: VisibilityManagerContextInterface) => (
       <>
-        <ReactPopperReference>
+        <Reference>
           {({ ref: reactPopperReferenceRef }) => (
             <TriggerElement
               {...context}
               initRef={provideRef(context.initRef, reactPopperReferenceRef, setVisibilityContextAndTriggerRef(context))}
             />
           )}
-        </ReactPopperReference>
+        </Reference>
       </>
     ),
     [TriggerElement, setVisibilityContextAndTriggerRef],
@@ -43,12 +45,12 @@ function PopupManagerForClick({
   const ignoreElements = React.useMemo(() => [popupElementHtmlNode], [popupElementHtmlNode]);
 
   return (
-    <ReactPopperManager>
+    <Manager>
       <VisibilityManager outsideClickIgnoreElements={ignoreElements} closeOnClickOutside={closeOnClickOutside}>
         {Element}
       </VisibilityManager>
       {popupElementNode && React.cloneElement(popupElementNode as any, { ref: setPopupElementHtmlNode })}
-    </ReactPopperManager>
+    </Manager>
   );
 }
 

src/primitives/PopupManager/PopupManagers/PopupManagerForExternalControl.tsx

@@ -1,8 +1,10 @@
 import React from "react";
-import { Manager as ReactPopperManager, Reference as ReactPopperReference } from "react-popper";
 import { provideRef } from "@worksolutions/react-utils";
 import { observer } from "mobx-react-lite";
 
+import { Manager } from "primitives/Popper/Manager";
+import { Reference } from "primitives/Popper/Reference";
+
 import VisibilityManager, { VisibilityManagerContextInterface } from "../../VisibilityManager";
 import { SetVisibilityContextAndTriggerRef } from "./types";
 
@@ -22,7 +24,7 @@ function PopupManagerForExternalControl({
   const Element = React.useCallback(
     (context: VisibilityManagerContextInterface) => (
       <>
-        <ReactPopperReference>
+        <Reference>
           {({ ref: reactPopperReferenceRef }) => (
             <TriggerElement
               toggle={context.toggle}
@@ -32,18 +34,18 @@ function PopupManagerForExternalControl({
               initRef={provideRef(context.initRef, reactPopperReferenceRef, setVisibilityContextAndTriggerRef(context))}
             />
           )}
-        </ReactPopperReference>
+        </Reference>
       </>
     ),
     [TriggerElement, setVisibilityContextAndTriggerRef],
   );
 
   return (
     <>
-      <ReactPopperManager>
+      <Manager>
         <VisibilityManager closeOnClickOutside={false}>{Element}</VisibilityManager>
         {popupElementNode}
-      </ReactPopperManager>
+      </Manager>
     </>
   );
 }