@jobber/components 4.7.0 → 4.7.1-mike.2

package/dist/Autocomplete/Menu.d.ts

@@ -1,10 +1,11 @@
-/// <reference types="react" />
+import React, { RefObject } from "react";
 import { Option } from "./Option";
 interface MenuProps {
     readonly visible: boolean;
     readonly options: Option[];
     readonly selectedOption?: Option;
+    readonly attachTo: RefObject<Element | null>;
     onOptionSelect(chosenOption: Option): void;
 }
-export declare function Menu({ visible, options, selectedOption, onOptionSelect, }: MenuProps): JSX.Element;
+export declare function Menu({ visible, options, selectedOption, onOptionSelect, attachTo, }: MenuProps): React.ReactPortal;
 export {};

package/dist/Autocomplete/index.js

@@ -8,6 +8,8 @@ var debounce = require('lodash/debounce');
 var styleInject_es = require('../style-inject.es-9d2f5f4e.js');
 var classnames = require('classnames');
 var useEventListener = require('@use-it/event-listener');
+var ReactDOM = require('react-dom');
+var reactPopper = require('react-popper');
 var Text = require('../Text-e7ed0974.js');
 var Icon = require('../Icon-405a216c.js');
 var Heading = require('../Heading-a1191b15.js');
@@ -39,19 +41,16 @@ var IndexChange;
     IndexChange[IndexChange["Previous"] = -1] = "Previous";
     IndexChange[IndexChange["Next"] = 1] = "Next";
 })(IndexChange || (IndexChange = {}));
-function Menu({ visible, options, selectedOption, onOptionSelect, }) {
+function Menu({ visible, options, selectedOption, onOptionSelect, attachTo, }) {
     const [highlightedIndex, setHighlightedIndex] = React.useState(0);
-    const optionMenuClass = classnames__default["default"](styles.options, {
-        [styles.visible]: visible,
-    });
-    const menuDiv = React.useRef();
+    const { setPositionedElementRef, styles: popperStyles, attributes, targetWidth, } = useRepositionMenu(attachTo);
     const detectSeparatorCondition = (option) => option.description || option.details;
     const detectGroups = (option) => option.options;
     const addSeparators = options.some(detectSeparatorCondition);
     const initialHighlight = options.some(detectGroups) ? 1 : 0;
     setupKeyListeners();
     React.useEffect(() => setHighlightedIndex(initialHighlight), [options]);
-    return (React__default["default"].createElement("div", { className: optionMenuClass, ref: menuDiv }, options.map((option, index) => {
+    const menu = (React__default["default"].createElement("div", Object.assign({ className: classnames__default["default"](styles.options, { [styles.visible]: visible }), ref: setPositionedElementRef, style: Object.assign(Object.assign({}, popperStyles.popper), { width: targetWidth }) }, attributes.popper), options.map((option, index) => {
         const optionClass = classnames__default["default"](styles.option, {
             [styles.active]: index === highlightedIndex,
             [styles.separator]: addSeparators,
@@ -69,40 +68,20 @@ function Menu({ visible, options, selectedOption, onOptionSelect, }) {
                 option.details !== undefined && (React__default["default"].createElement("div", { className: styles.details },
                     React__default["default"].createElement(Text.Text, null, option.details))))));
     })));
+    return ReactDOM.createPortal(menu, document.body);
     function setupKeyListeners() {
         useOnKeyDown("ArrowDown", (event) => {
             const indexChange = arrowKeyPress(event, IndexChange.Next);
             if (indexChange) {
                 setHighlightedIndex(Math.min(options.length - 1, highlightedIndex + indexChange));
             }
-            if (menuDiv.current) {
-                scrollMenuIfItemNotInView(menuDiv.current, "down");
-            }
         });
         useOnKeyDown("ArrowUp", (event) => {
             const indexChange = arrowKeyPress(event, IndexChange.Previous);
             if (indexChange) {
                 setHighlightedIndex(Math.max(0, highlightedIndex + indexChange));
             }
-            if (menuDiv.current) {
-                scrollMenuIfItemNotInView(menuDiv.current, "up");
-            }
         });
-        function scrollMenuIfItemNotInView(menuDivElement, direction) {
-            const itemDiv = menuDivElement.querySelector(`button.${styles.option}:nth-child(${highlightedIndex + 1})`);
-            if (!itemDiv)
-                return;
-            const menuTop = menuDivElement.getBoundingClientRect().top;
-            const { top: itemTop, height: itemHeight, bottom: itemBottom, } = itemDiv.getBoundingClientRect();
-            const itemTrueBottom = itemBottom + itemHeight;
-            const menuBottom = menuDivElement.getBoundingClientRect().bottom;
-            if (direction == "up" && itemTop - itemHeight < menuTop) {
-                menuDivElement.scrollTop -= itemHeight;
-            }
-            else if (direction == "down" && itemTrueBottom > menuBottom) {
-                menuDivElement.scrollTop += itemHeight;
-            }
-        }
         useOnKeyDown("Enter", (event) => {
             if (!visible)
                 return;
@@ -141,6 +120,18 @@ function isGroup(option) {
         return true;
     return false;
 }
+function useRepositionMenu(attachTo) {
+    var _a;
+    const [positionElement, setPositionedElementRef] = React.useState();
+    const popper = reactPopper.usePopper(attachTo.current, positionElement, {
+        modifiers: [
+            { name: "offset", options: { offset: [0, 8] } },
+            { name: "flip", options: { fallbackPlacements: ["top"] } },
+        ],
+    });
+    const targetWidth = (_a = attachTo.current) === null || _a === void 0 ? void 0 : _a.clientWidth;
+    return Object.assign(Object.assign({}, popper), { setPositionedElementRef, targetWidth });
+}
 
 /**
  * Max statements disabled here to make room for the
@@ -152,6 +143,7 @@ function Autocomplete({ initialOptions = [], value, allowFreeForm = true, size =
     const [options, setOptions] = React.useState(initialOptions);
     const [menuVisible, setMenuVisible] = React.useState(false);
     const [inputText, setInputText] = React.useState((_a = value === null || value === void 0 ? void 0 : value.label) !== null && _a !== void 0 ? _a : "");
+    const autocompleteRef = React.useRef(null);
     const delayedSearch = debounce__default["default"](updateSearch, debounceRate);
     React.useEffect(() => {
         delayedSearch();
@@ -161,9 +153,9 @@ function Autocomplete({ initialOptions = [], value, allowFreeForm = true, size =
         var _a;
         updateInput((_a = value === null || value === void 0 ? void 0 : value.label) !== null && _a !== void 0 ? _a : "");
     }, [value]);
-    return (React__default["default"].createElement("div", { className: styles.autocomplete },
+    return (React__default["default"].createElement("div", { className: styles.autocomplete, ref: autocompleteRef },
         React__default["default"].createElement(InputText.InputText, { autocomplete: false, size: size, invalid: invalid, value: inputText, onChange: handleInputChange, placeholder: placeholder, onFocus: handleInputFocus, onBlur: handleInputBlur }),
-        menuVisible && (React__default["default"].createElement(Menu, { visible: true, options: options, selectedOption: value, onOptionSelect: handleMenuChange }))));
+        menuVisible && (React__default["default"].createElement(Menu, { attachTo: autocompleteRef, visible: true, options: options, selectedOption: value, onOptionSelect: handleMenuChange }))));
     function updateInput(newText) {
         setInputText(newText);
         if (newText === "") {

package/dist/InputText/InputText.d.ts

@@ -18,7 +18,7 @@ export declare const InputText: React.ForwardRefExoticComponent<({
     readonly inline?: boolean | undefined;
     loading?: boolean | undefined;
     readonly name?: string | undefined;
-    onChange?: ((newValue: string | number | boolean | Date, event?: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement> | undefined) => void) | undefined;
+    onChange?: ((newValue: string | number | boolean | Date, event?: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined) => void) | undefined;
     onValidation?: ((message: string) => void) | undefined;
     readonly placeholder?: string | undefined;
     readonly size?: "large" | "small" | undefined;
@@ -28,7 +28,7 @@ export declare const InputText: React.ForwardRefExoticComponent<({
     onFocus?: (() => void) | undefined;
     onBlur?: (() => void) | undefined;
     readonly autocomplete?: boolean | import("../FormField").AutocompleteTypes | undefined;
-    inputRef?: React.RefObject<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement> | undefined;
+    inputRef?: React.RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined;
     readonly keyboard?: "numeric" | "decimal" | undefined;
     readonly maxLength?: number | undefined;
     readonly suffix?: {
@@ -66,7 +66,7 @@ export declare const InputText: React.ForwardRefExoticComponent<({
     readonly inline?: boolean | undefined;
     loading?: boolean | undefined;
     readonly name?: string | undefined;
-    onChange?: ((newValue: string | number | boolean | Date, event?: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement> | undefined) => void) | undefined;
+    onChange?: ((newValue: string | number | boolean | Date, event?: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined) => void) | undefined;
     onValidation?: ((message: string) => void) | undefined;
     readonly placeholder?: string | undefined;
     readonly size?: "large" | "small" | undefined;
@@ -76,7 +76,7 @@ export declare const InputText: React.ForwardRefExoticComponent<({
     onFocus?: (() => void) | undefined;
     onBlur?: (() => void) | undefined;
     readonly autocomplete?: boolean | import("../FormField").AutocompleteTypes | undefined;
-    inputRef?: React.RefObject<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement> | undefined;
+    inputRef?: React.RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined;
     readonly keyboard?: "numeric" | "decimal" | undefined;
     readonly maxLength?: number | undefined;
     readonly suffix?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components",
-  "version": "4.7.0",
+  "version": "4.7.1-mike.2+a1a4e681",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,8 +18,8 @@
   ],
   "dependencies": {
     "@jobber/design": "^0.32.0",
-    "@jobber/formatters": "*",
-    "@jobber/hooks": "*",
+    "@jobber/formatters": "^0.2.2",
+    "@jobber/hooks": "^2.0.2",
     "@popperjs/core": "^2.0.6",
     "@std-proposal/temporal": "0.0.1",
     "@tanstack/react-table": "8.5.13",
@@ -82,5 +82,5 @@
     "> 1%",
     "IE 10"
   ],
-  "gitHead": "ccd859dfba70f347b466ea6a9d8e9ff5feb9bcd1"
+  "gitHead": "a1a4e6815a6bb4d8ea9904a7465886d300a706d8"
 }