@bitrise/bitkit 9.4.1 → 9.5.0-alpha-15.2

package/src/Placement/Placement.css

@@ -1,29 +1,10 @@
 
-:root {
-  --Placement-arrow-size: var(--size--x3);
-}
-
 .Placement {
   position: absolute;
-  margin: var(--Placement-arrow-size);
   z-index: var(--z-index-Placement--below-modal);
   pointer-events: none;
 }
 
-.Placement--disable-margin {
-  margin: 0;
-}
-
-.Placement--disable-margin-top-bottom {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.Placement--disable-margin-left-right {
-  margin-right: 0;
-  margin-left: 0;
-}
-
 .Placement--animate {
   transition-property: transform;
   transition-duration: var(--transition-duration--fast);
@@ -83,50 +64,51 @@
   border-top: 0.0625rem solid var(--color-gray--2);
 }
 
-.Placement__arrow {
+.Placement__arrow,
+.Placement__arrow::before {
   position: absolute;
-  width: var(--Placement-arrow-size);
-  height: var(--Placement-arrow-size);
+  width: var(--size--x3);
+  height: var(--size--x3);
 }
 
 .Placement__arrow,
 .Placement__arrow:first-child,
 .Placement__arrow:last-child {
-  margin: var(--Placement-arrow-size);
+  visibility: hidden;
+}
+
+.Placement__arrow::before {
+  content: '';
+  display: block;
+  transform: rotate(45deg);
+  background: inherit;
+  visibility: visible;
 }
 
 .Placement--top .Placement__arrow,
 .Placement--top-start .Placement__arrow,
 .Placement--top-end .Placement__arrow {
   top: 100%;
-  transform:
-    translateY(calc(-50% + var(--Placement-arrow-size) * -1))
-    rotate(45deg);
+  margin-top: -0.375rem;
 }
 
 .Placement--right .Placement__arrow,
 .Placement--right-start .Placement__arrow,
 .Placement--right-end .Placement__arrow {
   right: 100%;
-  transform:
-    translateX(calc(50% - var(--Placement-arrow-size) * -1))
-    rotate(45deg);
+  margin-right: -0.375rem;
 }
 
 .Placement--bottom .Placement__arrow,
 .Placement--bottom-start .Placement__arrow,
 .Placement--bottom-end .Placement__arrow {
   bottom: 100%;
-  transform:
-    translateY(calc(50% - var(--Placement-arrow-size) * -1))
-    rotate(45deg);
+  margin-bottom: -0.375rem;
 }
 
 .Placement--left .Placement__arrow,
 .Placement--left-start .Placement__arrow,
 .Placement--left-end .Placement__arrow {
   left: 100%;
-  transform:
-    translateX(calc(-50% + var(--Placement-arrow-size) * -1))
-    rotate(45deg);
+  margin-left: -0.375rem;
 }

package/src/Placement/Placement.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Placement as TypePlacement, ReferenceObject as TypeReferenceObject } from 'popper.js';
+import { Placement as TypePlacement } from '@popperjs/core';
 import { Props as BaseProps } from '../Base/Base';
 import { ModalContext } from '../Modal/ModalContext';
 import PlacementPopper from './PlacementPopper';
@@ -13,15 +13,11 @@ export interface Props extends BaseProps {
   animatePosition?: boolean;
   /**
    * A render callback function that provides a
-   * scheduleUpdate function to trigger a reposition,
+   * update function to trigger a reposition,
    * and the width of the target that is being positioned
    * around.
    */
-  children: (props: { scheduleUpdate: () => void; width?: number }) => React.ReactNode;
-  /**
-   * Flag that disables margin around the Placement.
-   */
-  disableMargin?: boolean | 'top-bottom' | 'left-right';
+  children: (props: { update: () => void; width?: number }) => React.ReactNode;
   /**
    * Flag that disables repositioning on scroll and resize events.
    */
@@ -45,7 +41,8 @@ export interface Props extends BaseProps {
   /**
    * An optional reference element to be used as the target.
    */
-  referenceElement?: TypeReferenceObject;
+  referenceElement?: any;
+  sameWidth?: boolean;
   /**
    * The visibilty of the positioned content.
    */

package/src/Placement/PlacementPopper.tsx

@@ -1,6 +1,7 @@
+/* eslint-disable react/default-props-match-prop-types */
 import * as React from 'react';
 import { createPortal } from 'react-dom';
-import { Placement as TypePlacement, ReferenceObject as TypeReferenceObject } from 'popper.js';
+import { Placement as TypePlacement, VirtualElement } from '@popperjs/core';
 import { Popper, PopperProps } from 'react-popper';
 import { CSSTransition } from 'react-transition-group';
 import classnames from 'classnames';
@@ -27,15 +28,14 @@ const transitionClasses = {
 
 export interface Props extends BaseProps {
   animatePosition?: boolean;
-  children: (props: { scheduleUpdate: () => void; width?: number }) => React.ReactNode;
+  children: (props: { update: () => void; width?: number }) => React.ReactNode;
   closeElement?: null | HTMLElement;
-  disableMargin?: boolean | 'top-bottom' | 'left-right';
   disableReposition?: boolean;
   flip?: boolean;
   isInsideModal?: boolean;
   onClose?: (event: MouseEvent) => void;
   placement?: TypePlacement;
-  referenceElement?: TypeReferenceObject;
+  referenceElement?: any;
   visible?: boolean;
   timeout?: number;
 }
@@ -46,13 +46,13 @@ const PlacementPopper: React.FunctionComponent<Props> = (props: Props) => {
     backgroundColor,
     children,
     closeElement,
-    disableMargin,
     disableReposition,
     flip,
     isInsideModal,
     onClose,
     placement: desiredPlacement,
     referenceElement,
+    sameWidth,
     visible,
     timeout = transitionDurationFast,
     ...rest
@@ -61,6 +61,8 @@ const PlacementPopper: React.FunctionComponent<Props> = (props: Props) => {
   const ref = useRef<HTMLElement | null>();
   const [render, setRender] = useState(visible);
 
+  const [reference, setReference] = useState<Element | VirtualElement | undefined>(undefined);
+
   useEffect(() => {
     if (visible) {
       setRender(true);
@@ -71,11 +73,14 @@ const PlacementPopper: React.FunctionComponent<Props> = (props: Props) => {
     closeElement || document,
     'click',
     (event) => {
-      if (onClose && ref.current && !ref.current.contains(event.target as Node)) {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      /* @ts-ignore */
+      const isReferenceInPath = [...event.composedPath()].includes(reference);
+      if (onClose && ref.current && !ref.current.contains(event.target as Node) && !isReferenceInPath) {
         onClose(event as MouseEvent);
       }
     },
-    [onClose],
+    [onClose, reference],
   );
 
   useEventListener(
@@ -93,19 +98,36 @@ const PlacementPopper: React.FunctionComponent<Props> = (props: Props) => {
     return null;
   }
 
-  const popperProps: PopperProps = {
-    children: () => null,
-    eventsEnabled: !disableReposition,
-    placement: desiredPlacement,
-    modifiers: {
-      preventOverflow: {
-        boundariesElement: 'window',
-      },
-      flip: {
-        behavior: 'flip',
-        enabled: flip,
+  const modifiers: any[] = [
+    {
+      name: 'offset',
+      options: {
+        offset: [0, 12],
       },
     },
+  ];
+
+  if (sameWidth) {
+    modifiers.push({
+      enabled: true,
+      name: 'sameWidth',
+      phase: 'beforeWrite',
+      requires: ['computeStyles'],
+      fn: ({ state }: any) => {
+        // eslint-disable-next-line no-param-reassign
+        state.styles.popper.width = `${state.rects.reference.width}px`;
+      },
+      effect: ({ state }: any) => {
+        // eslint-disable-next-line no-param-reassign
+        state.elements.popper.style.width = `${state.elements.reference.getBoundingClientRect().width || 0}px`;
+      },
+    });
+  }
+
+  const popperProps: PopperProps<any> = {
+    children: () => null,
+    placement: desiredPlacement,
+    modifiers,
   };
 
   if (referenceElement) {
@@ -114,39 +136,45 @@ const PlacementPopper: React.FunctionComponent<Props> = (props: Props) => {
 
   return createPortal(
     // eslint-disable-next-line no-return-assign
-    <Popper {...popperProps} innerRef={(el) => (ref.current = el || null)}>
+    <Popper
+      {...popperProps}
+      // eslint-disable-next-line no-return-assign
+      innerRef={(el) => (ref.current = el || null)}
+      onFirstUpdate={(state) => {
+        setReference(state.elements?.reference);
+      }}
+    >
       {/* eslint-disable-next-line @typescript-eslint/no-shadow */}
-      {({ arrowProps, placement, ref, scheduleUpdate, style }) => (
-        // eslint-disable-next-line react/jsx-no-constructed-context-values
-        <PlacementArrowPropsContext.Provider value={{ ...arrowProps, backgroundColor }}>
-          <div
-            className={classnames('Placement', `Placement--${placement}`, {
-              'Placement--above-modal': isInsideModal,
-              'Placement--animate': animatePosition,
-              'Placement--disable-margin': disableMargin === true,
-              'Placement--disable-margin-top-bottom': disableMargin === 'top-bottom',
-              'Placement--disable-margin-left-right': disableMargin === 'left-right',
-            })}
-            ref={ref}
-            style={style}
-          >
-            <CSSTransition appear={visible} classNames={transitionClasses} in={visible} timeout={timeout}>
-              <div className="Placement__content">
-                <Base {...rest} backgroundColor={backgroundColor} className="Placement__shadow">
-                  <PlacementManagerContext.Consumer>
-                    {({ referenceNode }) =>
-                      children({
-                        scheduleUpdate,
-                        width: (referenceNode && referenceNode.clientWidth) || undefined,
-                      })
-                    }
-                  </PlacementManagerContext.Consumer>
-                </Base>
-              </div>
-            </CSSTransition>
-          </div>
-        </PlacementArrowPropsContext.Provider>
-      )}
+      {({ arrowProps, placement, ref, update, style }) => {
+        return (
+          // eslint-disable-next-line react/jsx-no-constructed-context-values
+          <PlacementArrowPropsContext.Provider value={{ ...arrowProps, backgroundColor }}>
+            <div
+              className={classnames('Placement', `Placement--${placement}`, {
+                'Placement--above-modal': isInsideModal,
+                'Placement--animate': animatePosition,
+              })}
+              ref={ref}
+              style={style}
+            >
+              <CSSTransition appear={visible} classNames={transitionClasses} in={visible} timeout={timeout}>
+                <div className="Placement__content">
+                  <Base {...rest} backgroundColor={backgroundColor} className="Placement__shadow">
+                    <PlacementManagerContext.Consumer>
+                      {({ referenceNode }) =>
+                        children({
+                          update,
+                          width: (referenceNode && referenceNode.clientWidth) || undefined,
+                        })
+                      }
+                    </PlacementManagerContext.Consumer>
+                  </Base>
+                </div>
+              </CSSTransition>
+            </div>
+          </PlacementArrowPropsContext.Provider>
+        );
+      }}
     </Popper>,
     document.body,
   );

package/src/Tooltip/Tooltip.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ReferenceChildrenProps } from 'react-popper';
-import { Placement as TypePlacement } from 'popper.js';
+import { Placement as TypePlacement } from '@popperjs/core';
 import { Props as BaseProps } from '../Base/Base';
 import Placement from '../Placement/Placement';
 import PlacementArea from '../Placement/PlacementArea';

package/src/hooks/useEventListener.ts

@@ -4,10 +4,30 @@ type HTMLElementOrDocumentOrWindow = HTMLElement | Document | Window;
 interface HTMLElementOrDocumentOrWindowEventMap extends HTMLElementEventMap, DocumentEventMap, WindowEventMap {}
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-function useEventListener<E extends Window, K extends keyof WindowEventMap>(el: E | null | undefined, type: K, handler: (evnt: WindowEventMap[K]) => void, watch?: any[]): void;
-function useEventListener<E extends Document, K extends keyof DocumentEventMap>(el: E | null | undefined, type: K, handler: (evt: DocumentEventMap[K]) => void, watch?: any[]): void;
-function useEventListener<E extends HTMLElement, K extends keyof HTMLElementEventMap>(el: E | null | undefined, type: K, handler: (evt: HTMLElementEventMap[K]) => void, watch?: any[]): void;
-function useEventListener<K extends keyof HTMLElementOrDocumentOrWindowEventMap>(el: HTMLElementOrDocumentOrWindow, type: string, handler: (evt: HTMLElementOrDocumentOrWindowEventMap[K]) => void, watch?: any[]): void;
+function useEventListener<E extends Window, K extends keyof WindowEventMap>(
+  el: E | null | undefined,
+  type: K,
+  handler: (evnt: WindowEventMap[K]) => void,
+  watch?: any[],
+): void;
+function useEventListener<E extends Document, K extends keyof DocumentEventMap>(
+  el: E | null | undefined,
+  type: K,
+  handler: (evt: DocumentEventMap[K]) => void,
+  watch?: any[],
+): void;
+function useEventListener<E extends HTMLElement, K extends keyof HTMLElementEventMap>(
+  el: E | null | undefined,
+  type: K,
+  handler: (evt: HTMLElementEventMap[K]) => void,
+  watch?: any[],
+): void;
+function useEventListener<K extends keyof HTMLElementOrDocumentOrWindowEventMap>(
+  el: HTMLElementOrDocumentOrWindow,
+  type: string,
+  handler: (evt: HTMLElementOrDocumentOrWindowEventMap[K]) => void,
+  watch?: any[],
+): void;
 function useEventListener(el: any, type: string, handler: any, watch?: any[]) {
   useEffect(() => {
     if (el) {
@@ -20,6 +40,6 @@ function useEventListener(el: any, type: string, handler: any, watch?: any[]) {
       }
     };
   }, watch || []);
-};
+}
 
 export default useEventListener;