@applica-software-guru/react-admin 1.2.121 → 1.2.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applica-software-guru/react-admin",
-  "version": "1.2.121",
+  "version": "1.2.123",
   "private": false,
   "repository": {
     "type": "git",

package/src/components/ra-forms/LongForm/Provider.tsx

@@ -3,7 +3,7 @@ import { matchPath, useLocation } from 'react-router';
 
 import { IItem } from './types';
 import _ from 'lodash';
-import { getItemsIds } from './utils';
+import { getChildren, getItemsIds, getLevel } from './utils';
 
 enum ActionType {
   SET_FORM_ROOT_PATH = 'setFormRootPath',
@@ -145,7 +145,15 @@ function Provider(props: IProviderProps) {
 
   useEffect(() => {
     if (syncWithLocation && formRootPath !== undefined) {
-      const locationItem = pathname.replace(`${formRootPath}/`, '');
+      let locationItem = pathname.replace(formRootPath, '').replace(new RegExp(/^\/?/), '');
+      if (_.isEmpty(locationItem)) {
+        locationItem =
+          _.chain(items)
+            .filter((item) => getChildren(item.id, items).length === 0)
+            .orderBy([(item) => getLevel(item.id), (item) => item.index])
+            .first()
+            .value()?.id ?? undefined;
+      }
       dispatch({
         type: ActionType.SET_ACTIVE_ITEM,
         payload: locationItem

package/src/components/ra-forms/LongForm/hooks.tsx

@@ -1,8 +1,7 @@
-import _ from 'lodash';
 import { useCallback, useMemo } from 'react';
 import { useActiveItem, useFormRootPath, useItems } from './Provider';
 import { IItem } from './types';
-import { getLevel, isChild } from './utils';
+import { getChildren, isChild } from './utils';
 import { useNavigate } from 'react-router';
 
 function useIsActive(id: string): boolean {
@@ -12,13 +11,7 @@ function useIsActive(id: string): boolean {
 
 function useChildren(id?: string): Array<IItem> {
   const items = useItems(),
-    level = id !== undefined ? getLevel(id) : 0,
-    children = useMemo(() => {
-      return _.chain(items)
-        .filter((item) => (id !== undefined ? isChild(id, item.id) : true))
-        .filter((item) => getLevel(item.id) === level + 1)
-        .value();
-    }, [items, level, id]);
+    children = useMemo(() => getChildren(id, items), [items, id]);
 
   return children;
 }

package/src/components/ra-forms/LongForm/utils.ts

@@ -19,4 +19,14 @@ function getLevel(id: string): number {
   return match === null ? 0 : match.length;
 }
 
-export { getId, isChild, getItemsIds, getLevel };
+function getChildren(id: string | undefined, items: Array<IItem>) {
+  const level = id !== undefined ? getLevel(id) : 0,
+    children = _.chain(items)
+      .filter((item) => (id !== undefined ? isChild(id, item.id) : true))
+      .filter((item) => getLevel(item.id) === level + 1)
+      .value();
+
+  return children;
+}
+
+export { getId, isChild, getItemsIds, getLevel, getChildren };