@linzjs/step-ag-grid 17.0.7 → 17.2.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "17.0.7",
+  "version": "17.2.0",
   "keywords": [
     "aggrid",
     "ag-grid",

package/src/components/GridPopoverHook.tsx

@@ -78,7 +78,6 @@ export const useGridPopoverHook = <RowType extends GridBaseRow>(props: GridPopov
               viewScroll={"auto"}
               dontShrinkIfDirectionIsTop={true}
               className={props.className}
-              closeMenuExclusionClassName={"ReactModal__Content"}
             >
               {saving && ( // This is the overlay that prevents editing when the editor is saving
                 <div className={"ComponentLoadingWrapper-saveOverlay"} />

package/src/components/gridForm/GridFormMultiSelect.tsx

@@ -1,6 +1,7 @@
-import { fromPairs, groupBy, isEmpty, pick, toPairs } from "lodash-es";
-import {
+import { defer, fromPairs, groupBy, isEmpty, pick, toPairs } from "lodash-es";
+import React, {
   Dispatch,
+  ForwardedRef,
   Fragment,
   KeyboardEvent,
   ReactElement,
@@ -73,6 +74,7 @@ export const GridFormMultiSelect = <RowType extends GridBaseRow>(props: GridForm
 
   const subComponentIsValidRef = useRef<Record<string, boolean>>({});
   const optionsInitialising = useRef(false);
+  const firstInputSubComponent = useRef<HTMLInputElement | null>(null);
 
   const [filter, setFilter] = useState("");
   const [initialValues, setInitialValues] = useState("");
@@ -191,11 +193,21 @@ export const GridFormMultiSelect = <RowType extends GridBaseRow>(props: GridForm
                           <MenuDivider key={`div_${index}`} />
                         ) : (
                           <Fragment key={`val_${item.value}`}>
-                            <MenuRadioItem item={item} options={options} setOptions={setOptions} />
-
+                            <MenuRadioItem
+                              item={item}
+                              options={options}
+                              setOptions={setOptions}
+                              onChecked={() => {
+                                // Default to focus on first input in subComponent
+                                defer(() => {
+                                  firstInputSubComponent.current?.focus();
+                                });
+                              }}
+                            />
                             {item.checked && item.subComponent && (
                               <MenuSubComponent
                                 {...{ item, options, setOptions, data, triggerSave }}
+                                ref={firstInputSubComponent}
                                 subComponentIsValid={subComponentIsValidRef.current}
                               />
                             )}
@@ -350,6 +362,7 @@ const MenuRadioItem = (props: {
   item: MultiSelectOption;
   options: MultiSelectOption[];
   setOptions: (options: MultiSelectOption[]) => void;
+  onChecked?: () => void;
 }) => {
   const { item, options, setOptions } = props;
 
@@ -369,6 +382,7 @@ const MenuRadioItem = (props: {
           e.keepOpen = true;
           toggleValue(item);
         }
+        item.checked && props.onChecked && props.onChecked();
       }}
     >
       <LuiCheckboxInput
@@ -395,17 +409,35 @@ const MenuRadioItem = (props: {
   );
 };
 
-const MenuSubComponent = (props: {
-  data: any;
-  item: MultiSelectOption;
-  options: MultiSelectOption[];
-  setOptions: (options: MultiSelectOption[]) => void;
-  subComponentIsValid: Record<string, boolean>;
-  triggerSave: () => Promise<void>;
-}) => {
+const MenuSubComponent = React.forwardRef(MenuSubComponentFr);
+
+function MenuSubComponentFr(
+  props: {
+    data: any;
+    item: MultiSelectOption;
+    options: MultiSelectOption[];
+    setOptions: (options: MultiSelectOption[]) => void;
+    subComponentIsValid: Record<string, boolean>;
+    triggerSave: () => Promise<void>;
+  },
+  ref: ForwardedRef<HTMLInputElement>,
+) {
   const { data, item, options, setOptions, subComponentIsValid, triggerSave } = props;
+  const focusableRef = React.useRef<HTMLElement | null>(null);
+
+  useEffect(() => {
+    if (focusableRef.current) {
+      const firstInputElement = focusableRef.current.querySelectorAll("input")[0] ?? null;
+      if (typeof ref === "function") {
+        ref(firstInputElement);
+      } else if (ref) {
+        ref.current = firstInputElement;
+      }
+    }
+  }, [ref]);
+
   return (
-    <FocusableItem className={"LuiDeprecatedForms"} key={`${item.value}_subcomponent`}>
+    <FocusableItem className={"LuiDeprecatedForms"} key={`${item.value}_subcomponent`} ref={focusableRef}>
       {() => (
         <GridSubComponentContext.Provider
           value={{
@@ -427,4 +459,4 @@ const MenuSubComponent = (props: {
       )}
     </FocusableItem>
   );
-};
+}

package/src/react-menu3/components/ControlledMenu.tsx

@@ -31,7 +31,6 @@ export const ControlledMenuFr = (
     onItemClick,
     onClose,
     saveButtonRef,
-    closeMenuExclusionClassName,
     ...restProps
   }: ControlledMenuProps & { saveButtonRef?: MutableRefObject<HTMLButtonElement | null> },
   externalRef: ForwardedRef<HTMLUListElement>,
@@ -68,10 +67,8 @@ export const ControlledMenuFr = (
   );
 
   const isWithinMenu = useCallback(
-    (target: EventTarget | null) =>
-      hasParentClass("szh-menu--state-open", target as Node) ||
-      (closeMenuExclusionClassName && hasParentClass(closeMenuExclusionClassName, target as Node)),
-    [closeMenuExclusionClassName],
+    (target: EventTarget | null) => hasParentClass("szh-menu--state-open", target as Node),
+    [],
   );
 
   const handleScreenEventForSave = useCallback(

package/src/react-menu3/types.ts

@@ -441,9 +441,4 @@ export interface ControlledMenuProps extends RootMenuProps, ExtraMenuProps {
    * Event fired when menu is about to close.
    */
   onClose?: EventHandler<MenuCloseEvent>;
-
-  /**
-   * When clicking outside the menu to close, anything with this class will not cause a close.
-   */
-  closeMenuExclusionClassName?: string;
 }

package/src/stories/grid/gridFormInteraction/GridFormMultiSelectInteraction.stories.tsx

@@ -111,7 +111,7 @@ GridFormMultiSelectInteractions_.play = async ({ canvasElement }) => {
   expect(textInput).toBeInTheDocument();
   expect(await canvas.findByText("Must not be empty")).toBeInTheDocument();
 
-  await userEvent.click(textInput);
+  // textInput should be autofocus
   await userEvent.type(textInput, "Hello");
   expect(await canvas.findByText("Press enter or tab to save")).toBeInTheDocument();