Revert "feat: Add keepAlign support (#36)"

This reverts commit 4f6ac65.
react-component · Jan 6, 2020 · e2583ec · e2583ec
1 parent 1a0e1d0
commit e2583ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 153 deletions.
diff --git a/examples/position.js b/examples/position.js
diff --git a/src/Align.tsx b/src/Align.tsx
@@ -22,8 +22,6 @@ export interface AlignProps {
   monitorWindowResize?: boolean;
   disabled?: boolean;
   children: React.ReactElement;
-  /** Always trigger align with each render */
-  keepAlign?: boolean;
 }
 
 interface MonitorRef {
@@ -45,27 +43,11 @@ function getPoint(point: TargetType) {
   return point;
 }
 
-interface InternalTestProps {
-  INTERNAL_TRIGGER_ALIGN?: Function;
-}
-
 const Align: React.RefForwardingComponent<RefAlign, AlignProps> = (
-  {
-    children,
-    disabled,
-    target,
-    align,
-    onAlign,
-    monitorWindowResize,
-    monitorBufferTime = 0,
-    keepAlign,
-    ...restProps
-  },
+  { children, disabled, target, align, onAlign, monitorWindowResize, monitorBufferTime = 0 },
   ref,
 ) => {
-  const cacheRef = React.useRef<{ element?: HTMLElement; point?: TargetPoint }>(
-    {},
-  );
+  const cacheRef = React.useRef<{ element?: HTMLElement; point?: TargetPoint }>({});
   const nodeRef = React.useRef();
   let childNode = React.Children.only(children);
 
@@ -81,17 +63,7 @@ const Align: React.RefForwardingComponent<RefAlign, AlignProps> = (
   forceAlignPropsRef.current.onAlign = onAlign;
 
   const [forceAlign, cancelForceAlign] = useBuffer(() => {
-    if (
-      process.env.NODE_ENV !== 'production' &&
-      (restProps as InternalTestProps).INTERNAL_TRIGGER_ALIGN
-    ) {
-      (restProps as InternalTestProps).INTERNAL_TRIGGER_ALIGN();
-    }
-
-    const {
-      disabled: latestDisabled,
-      target: latestTarget,
-    } = forceAlignPropsRef.current;
+    const { disabled: latestDisabled, target: latestTarget } = forceAlignPropsRef.current;
     if (!latestDisabled && latestTarget) {
       const source = nodeRef.current;
 
@@ -140,16 +112,10 @@ const Align: React.RefForwardingComponent<RefAlign, AlignProps> = (
     if (nodeRef.current !== sourceResizeMonitor.current.element) {
       sourceResizeMonitor.current.cancel();
       sourceResizeMonitor.current.element = nodeRef.current;
-      sourceResizeMonitor.current.cancel = monitorResize(
-        nodeRef.current,
-        forceAlign,
-      );
+      sourceResizeMonitor.current.cancel = monitorResize(nodeRef.current, forceAlign);
     }
 
-    if (
-      cacheRef.current.element !== element ||
-      !isSamePoint(cacheRef.current.point, point)
-    ) {
+    if (cacheRef.current.element !== element || !isSamePoint(cacheRef.current.point, point)) {
       forceAlign();
 
       // Add resize observer
@@ -170,15 +136,6 @@ const Align: React.RefForwardingComponent<RefAlign, AlignProps> = (
     }
   }, [disabled]);
 
-  /**
-   * [Legacy] Should keep re-algin since we don't know if target position changed.
-   */
-  React.useEffect(() => {
-    if (keepAlign && !disabled) {
-      forceAlign(true);
-    }
-  });
-
   // Listen for window resize
   const winResizeRef = React.useRef<{ remove: Function }>(null);
   React.useEffect(() => {

diff --git a/tests/element.test.js b/tests/element.test.js
@@ -26,10 +26,7 @@ describe('element align', () => {
     render() {
       return (
         <div style={{ paddingTop: 100 }}>
-          <div
-            ref={this.targetRef}
-            style={{ display: 'inline-block', width: 50, height: 50 }}
-          >
+          <div ref={this.targetRef} style={{ display: 'inline-block', width: 50, height: 50 }}>
             target
           </div>
           <Align target={this.getTarget} align={align} {...this.props}>
@@ -76,33 +73,12 @@ describe('element align', () => {
   it('disabled should trigger align', () => {
     const onAlign = jest.fn();
 
-    const wrapper = mount(
-      <Test monitorWindowResize onAlign={onAlign} disabled />,
-    );
+    const wrapper = mount(<Test monitorWindowResize onAlign={onAlign} disabled />);
     expect(onAlign).not.toHaveBeenCalled();
 
     wrapper.setProps({ disabled: false });
     jest.runAllTimers();
     expect(onAlign).toHaveBeenCalled();
   });
-
-  it('keepAlign', () => {
-    const triggerAlign = jest.fn();
-
-    class TestAlign extends React.Component {
-      state = {};
-
-      render = () => <Test INTERNAL_TRIGGER_ALIGN={triggerAlign} keepAlign />;
-    }
-
-    const wrapper = mount(<TestAlign />);
-    const times = triggerAlign.mock.calls.length;
-
-    for (let i = 0; i < 10; i += 1) {
-      wrapper.instance().forceUpdate();
-    }
-
-    expect(triggerAlign.mock.calls.length > times).toBeTruthy();
-  });
 });
 /* eslint-enable */