@wavemaker-ai/react-runtime 1.0.0-rc.647655 → 1.0.0-rc.647684

package/components/page/page-content/index.js

@@ -1,25 +1,45 @@
 "use client";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { jsx } from "react/jsx-runtime";
 import clsx from "clsx";
 import { useAppState } from "../../../context/WidgetProvider";
 import { getCurrentPath } from "../../../core/util/utils";
 const DEFAULT_CLASS = "app-page-content app-content-column";
 function WmPageContent(props) {
-  const { className, columnwidth, styles, layoutClassName } = props;
+  const { className, columnwidth, styles, layoutClassName, direction } = props;
   const appState = useAppState();
   const pageName = ((appState == null ? void 0 : appState.componentName) || (appState == null ? void 0 : appState.name) || getCurrentPath().split("/").pop() || "").toLowerCase();
   return /* @__PURE__ */ jsx("div", { className: "app-content-column-wrapper", children: /* @__PURE__ */ jsx("div", { className: clsx(pageName && `app-page-${pageName}`), style: { display: "inline" }, children: /* @__PURE__ */ jsx(
     "div",
-    {
+    __spreadProps(__spreadValues({
       style: styles,
       className: clsx(
         DEFAULT_CLASS,
         className,
         `col-sm-${columnwidth} col-md-${columnwidth}`,
         layoutClassName
-      ),
+      )
+    }, direction ? { direction } : {}), {
       children: props.children
-    }
+    })
   ) }) });
 }
 WmPageContent.displayName = "WmPageContent";

package/components/page/page-content/props.d.ts

@@ -9,6 +9,7 @@ export interface PageContentProps {
      * Utility layout classes from Studio Auto Layout (merged on the page-content root).
      */
     layoutClassName?: string;
+    direction?: string;
 }
 /**
  * Combined props for the WmPageContent component, including base WaveMaker props.

package/components/page/partial-container/index.js

@@ -70,7 +70,7 @@ const CodegenPartialContainer = memo((props) => {
     const partial = partials.find((p) => p.name === content);
     return partial ? React.createElement(partial.component, __spreadProps(__spreadValues({}, params), { onLoad: handleOnLoad })) : null;
   };
-  return /* @__PURE__ */ jsx("div", { className: clsx(content && `app-partial-${content.toLowerCase()}`), children: /* @__PURE__ */ jsx(Container, { className: "partial-container", children: contentToRender() }) });
+  return /* @__PURE__ */ jsx("div", { className: clsx(content && `app-partial-${content.toLowerCase()}`), children: /* @__PURE__ */ jsx(Container, { className: "partial-container", style: { height: "inherit" }, children: contentToRender() }) });
 }, arePropsEqual);
 CodegenPartialContainer.displayName = "WmPartialContainer";
 const WmPartialContainer = memo((props) => {

package/components/wmx/WmxRenderer.d.ts

@@ -0,0 +1,8 @@
+import { BaseProps } from "@wavemaker-ai/react-runtime/higherOrder/props";
+type WmxRendererProps = {
+    componentname: string;
+    field?: boolean;
+};
+type WmxRendererExtendedProps = WmxRendererProps & BaseProps;
+declare const WmxRenderer: (props: WmxRendererExtendedProps) => import("react/jsx-runtime").JSX.Element;
+export default WmxRenderer;

package/components/wmx/WmxRenderer.js

@@ -0,0 +1,57 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+import { jsx } from "react/jsx-runtime";
+import { useMemo } from "react";
+import { getWmxModule } from "../../utils/wmx.utils";
+import withFormController from "../data/form/form-controller/withFormController";
+import withBaseWrapper from "../../higherOrder/withBaseWrapper";
+const WmxRenderer = (props) => {
+  var _b;
+  const _a = props, { componentname, field } = _a, restProps = __objRest(_a, ["componentname", "field"]);
+  const wmxModule = getWmxModule();
+  const RawComponent = (_b = wmxModule == null ? void 0 : wmxModule[`Wmx${componentname}`]) != null ? _b : null;
+  const FormFieldComponent = useMemo(
+    () => RawComponent ? withBaseWrapper(withFormController(RawComponent)) : null,
+    [RawComponent]
+  );
+  const BaseWrappedComponent = useMemo(
+    () => RawComponent ? withBaseWrapper(RawComponent) : null,
+    [RawComponent]
+  );
+  if (!wmxModule || !RawComponent || !FormFieldComponent || !BaseWrappedComponent) return null;
+  const isFormField = String(field) === "true";
+  if (isFormField) {
+    return /* @__PURE__ */ jsx(FormFieldComponent, __spreadValues({ componentname }, restProps));
+  }
+  return /* @__PURE__ */ jsx(BaseWrappedComponent, __spreadValues({ componentname }, restProps));
+};
+var WmxRenderer_default = WmxRenderer;
+export {
+  WmxRenderer_default as default
+};

package/core/appstore.js

@@ -43,7 +43,7 @@ const appstore = {
 };
 if (!appstore.I18nService.get()) {
   appstore.I18nService.set({
-    selectedLocale: getSessionLocaleSafe() || "en",
+    selectedLocale: "en",
     messages: {},
     getSelectedLocale: function() {
       try {

package/core/proxy-service.d.ts

@@ -2,8 +2,23 @@ import { PageContextState, ProxyTarget } from "@wavemaker-ai/react-runtime/types
 import { OverriddenPropsRegistry } from "@wavemaker-ai/react-runtime/core/script-registry";
 import BaseAppProps from "../higherOrder/BaseAppProps";
 import { FormFieldProps } from "../components/data/form/form-field/props";
+import type { UseFormSetValue } from "react-hook-form";
 export declare function clearPageWidgetProxyCache(widgetsProxy: object | null | undefined): void;
 export declare const createWidgetProxy: (widget: any, widgetName: string, setPageContext: any, overriddenPropsRegistry?: OverriddenPropsRegistry) => any;
 export declare const createPageProxy: (target: ProxyTarget, setPageContext: React.Dispatch<React.SetStateAction<PageContextState>>, overriddenPropsRegistry?: OverriddenPropsRegistry) => ProxyTarget;
 export declare const createStateProxy: (obj: PageContextState | BaseAppProps, path: string[], setPageContext: React.Dispatch<React.SetStateAction<PageContextState>> | React.Dispatch<React.SetStateAction<BaseAppProps>>, overriddenPropsRegistry?: OverriddenPropsRegistry) => ProxyTarget;
-export declare const createFormFieldProxy: (formField: FormFieldProps, setState: React.Dispatch<React.SetStateAction<FormFieldProps>>, overriddenItemsRef: React.MutableRefObject<Record<string, any>>, formProxy: any) => any;
+/**
+ * Distinct fields with their canonical registry key - a field is stored under several keys,
+ * so dedupe by identity and keep the first (canonical) key. Iterate this, not Object.keys().
+ */
+export declare const getFormFieldEntries: (formfields: Record<string, any> | undefined) => {
+    key: string;
+    field: any;
+}[];
+/** Distinct field objects in registration order. */
+export declare const getFormFieldList: (formfields: Record<string, any> | undefined) => any[];
+/** Hidden `<name>_formWidget` lookup alias, so registry iteration yields one entry per field (as in Angular). */
+export declare const defineFieldAlias: (alias: string, widget: any, ...registries: any[]) => void;
+export declare const createFormFieldProxy: (formField: FormFieldProps, setState: React.Dispatch<React.SetStateAction<FormFieldProps>>, overriddenItemsRef: React.MutableRefObject<Record<string, any>>, formProxy: any, formRef?: {
+    setValue?: UseFormSetValue<any>;
+}) => any;

package/core/proxy-service.js

@@ -550,28 +550,52 @@ const createStateProxy = (obj, path = [], setPageContext, overriddenPropsRegistr
     }
   });
 };
-const createFormFieldProxy = (formField, setState, overriddenItemsRef, formProxy) => {
+const getFormFieldEntries = (formfields) => {
+  const canonicalKeyByField = /* @__PURE__ */ new Map();
+  Object.entries(formfields != null ? formfields : {}).forEach(([key, field]) => {
+    if (field && !canonicalKeyByField.has(field)) canonicalKeyByField.set(field, key);
+  });
+  return [...canonicalKeyByField].map(([field, key]) => ({ key, field }));
+};
+const getFormFieldList = (formfields) => getFormFieldEntries(formfields).map(({ field }) => field);
+const defineFieldAlias = (alias, widget, ...registries) => registries.forEach(
+  (registry) => registry && Object.defineProperty(registry, alias, {
+    value: widget,
+    enumerable: false,
+    configurable: true,
+    writable: true
+  })
+);
+const createFormFieldProxy = (formField, setState, overriddenItemsRef, formProxy, formRef) => {
+  const { name, formKey } = formField;
+  const rhfKey = formKey || name;
   const fieldProxy = new Proxy(formField, {
     get: (target, prop) => {
+      if (prop === "setProperty") {
+        return function(key, value) {
+          fieldProxy[key] = value;
+          return this;
+        };
+      }
       return target[prop];
     },
     set: (target, prop, value) => {
       target[prop] = value;
       overriddenItemsRef.current[prop] = value;
       setState(__spreadValues({}, target));
+      if ((prop === "datavalue" || prop === "value") && rhfKey && (formRef == null ? void 0 : formRef.setValue)) {
+        formRef.setValue(rhfKey, value, { shouldValidate: false, shouldDirty: true });
+      }
       return true;
     }
   });
-  const name = formField.name;
-  const key = formField.formKey;
-  if (key) {
-    formProxy.formfields[key] = fieldProxy;
-    formProxy.formWidgets[key] = fieldProxy;
-  }
-  formProxy.formfields[`${name}_formWidget`] = fieldProxy;
-  formProxy.formWidgets[`${name}_formWidget`] = fieldProxy;
-  formProxy.formfields[`${name}`] = fieldProxy;
-  formProxy.formWidgets[`${name}`] = fieldProxy;
+  const { formfields, formWidgets } = formProxy;
+  [formKey, name].forEach((fieldKey) => {
+    if (!fieldKey) return;
+    formfields[fieldKey] = fieldProxy;
+    formWidgets[fieldKey] = fieldProxy;
+  });
+  defineFieldAlias(`${name}_formWidget`, fieldProxy, formfields, formWidgets);
   return fieldProxy;
 };
 export {
@@ -579,5 +603,8 @@ export {
   createFormFieldProxy,
   createPageProxy,
   createStateProxy,
-  createWidgetProxy
+  createWidgetProxy,
+  defineFieldAlias,
+  getFormFieldEntries,
+  getFormFieldList
 };

package/core/util/index.d.ts

@@ -38,8 +38,6 @@ export declare const getSessionStorageItem: (key: string) => any;
 export declare const getSessionLocaleSafe: () => string | undefined;
 export declare const getTimezone: () => string;
 export declare const formatMessage: (fragment: any, expression: string) => any;
-/** Angular parity: same appLocale object, swap message keys in place so bindings stay valid. */
-export declare function syncLocaleMessages(target: Record<string, any> | undefined, messages: Record<string, any>): boolean;
 export declare function reload(): void;
 export declare const toNumber: (value: any) => number;
 export declare const _get: {

package/core/util/index.js

@@ -93,34 +93,6 @@ const formatMessage = (fragment, expression) => {
   const path = `appLocale.${expression}`;
   return has(fragment, path) ? get(fragment, path) : void 0;
 };
-function syncLocaleMessages(target, messages) {
-  if (!target || typeof target !== "object") {
-    return false;
-  }
-  let synced = true;
-  Object.keys(target).forEach((key) => {
-    if (!(key in messages)) {
-      try {
-        delete target[key];
-      } catch (e) {
-        synced = false;
-      }
-    }
-  });
-  Object.keys(messages).forEach((key) => {
-    try {
-      const descriptor = Object.getOwnPropertyDescriptor(target, key);
-      if (descriptor && !descriptor.configurable && !descriptor.writable) {
-        synced = false;
-        return;
-      }
-      target[key] = messages[key];
-    } catch (e) {
-      synced = false;
-    }
-  });
-  return synced;
-}
 function reload() {
   window.location.reload();
 }
@@ -216,7 +188,6 @@ export {
   reload,
   replace,
   setSessionStorageItem,
-  syncLocaleMessages,
   toBoolean,
   toNumber
 };

package/higherOrder/BaseDateTime.js

@@ -235,7 +235,14 @@ const withBaseDateTime = (WrappedComponent) => {
       if (date == "CURRENT_DATE") {
         return /* @__PURE__ */ new Date();
       }
-      return typeof date === "string" ? moment(date).toDate() : date;
+      if (typeof date === "string") {
+        const parsed = moment(date).toDate();
+        return isNaN(parsed.getTime()) ? void 0 : parsed;
+      }
+      if (date instanceof Date) {
+        return isNaN(date.getTime()) ? void 0 : date;
+      }
+      return date;
     }, []);
     const handleKeyDown = useCallback((event) => {
       const arrowKeys = Object.values(ARROW_KEYS);

package/higherOrder/BasePage.js

@@ -52,7 +52,6 @@ import {
 } from "../core/script-registry";
 import formatters from "../core/formatters";
 import { useAppProxy } from "../context/AppContext";
-import { syncLocaleMessages } from "../core/util";
 import {
   computeMergedPageParams,
   computePartialParamKey,
@@ -67,7 +66,7 @@ import { viewportService } from "../store/viewport.service";
 import { formatMessage } from "../core/util";
 const withPageContext = (WrappedComponent, addPageScript, getVariables, componentInfo, prefabInfo) => {
   const PageContextComponent = (props) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c;
     const dispatch = useAppDispatch();
     const { show, hide } = (_a = useAppSpinner()) != null ? _a : {};
     const i18n = useAppSelector((state) => state.i18n);
@@ -147,8 +146,7 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
         date: i18n.dateFormat,
         time: i18n.timeFormat,
         currency: i18n.currencyCode
-      },
-      i18n
+      }
     }, prefabInfo), props), componentInfo), {
       executeStartup,
       formatters,
@@ -276,7 +274,6 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
       }
       isInitializingRef.current = true;
       const initializeComponent = async () => {
-        var _a2;
         try {
           overriddenPropsRegistryRef.current = createOverriddenPropsRegistry();
           const pageProxy = createStateProxy(
@@ -306,15 +303,12 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
           pageProxy.pageParams = newParams;
           if ((componentInfo == null ? void 0 : componentInfo.componentType) !== "PAGE") {
             pageProxy.partialParams = newParams;
-            (_a2 = props.onLoad) == null ? void 0 : _a2.call(props, pageProxy);
           }
           const mergedAppLocale = i18n.appLocale || {};
           if (!appProxy.appLocale) {
             appProxy.appLocale = {};
           }
-          if (!syncLocaleMessages(appProxy.appLocale, mergedAppLocale)) {
-            appProxy.appLocale = __spreadValues({}, mergedAppLocale);
-          }
+          appProxy.appLocale = __spreadValues({}, mergedAppLocale);
           const localeFormats = {
             date: i18n.dateFormat,
             time: i18n.timeFormat,
@@ -395,6 +389,9 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
           }
         });
         subscriptionsRef.current = [];
+        if ((componentInfo == null ? void 0 : componentInfo.componentName) && (componentInfo == null ? void 0 : componentInfo.componentType) == "PARTIAL" && appProxy && pageProxyRef.current && appProxy[componentInfo.componentName]) {
+          appProxy[componentInfo.componentName] = void 0;
+        }
       };
     }, [shouldInitialize]);
     useEffect(() => {
@@ -579,72 +576,37 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
       if (isLocaleSwitch && pageProxyRef.current) {
         pageProxyRef.current.Widgets = {};
       }
-      setPageContext((prev) => {
-        if (prev.selectedLocale === i18n.selectedLocale) {
-          return prev;
-        }
-        return __spreadValues(__spreadProps(__spreadValues({}, prev), {
-          selectedLocale: i18n.selectedLocale
-        }), isLocaleSwitch && { Widgets: {} });
-      });
-    }, [i18n.selectedLocale]);
-    const applyLocaleToProxies = useCallback(
-      (newAppLocale) => {
-        var _a2;
-        if (appProxy) {
-          if (!appProxy.appLocale) {
-            appProxy.appLocale = {};
-          }
-          if (!syncLocaleMessages(appProxy.appLocale, newAppLocale)) {
-            appProxy.appLocale = __spreadValues({}, newAppLocale);
-          }
-        }
-        if (pageProxyRef.current) {
-          if (!pageProxyRef.current.appLocale) {
-            pageProxyRef.current.appLocale = {};
-          }
-          if (!syncLocaleMessages(pageProxyRef.current.appLocale, newAppLocale)) {
-            pageProxyRef.current.appLocale = __spreadValues({}, newAppLocale);
-          }
-          if (pageProxyRef.current.App) {
-            pageProxyRef.current.App.appLocale = (_a2 = appProxy == null ? void 0 : appProxy.appLocale) != null ? _a2 : newAppLocale;
-          }
-        }
-      },
-      [appProxy == null ? void 0 : appProxy.appLocale]
-    );
-    if (isInitialized && pageProxyRef.current && ((_c = i18n.localeRevision) != null ? _c : 0) !== lastSyncedLocaleRevisionRef.current) {
-      const isLocaleChange = lastSyncedLocaleRevisionRef.current >= 0;
-      lastSyncedLocaleRevisionRef.current = (_d = i18n.localeRevision) != null ? _d : 0;
-      applyLocaleToProxies(i18n.appLocale);
-      if (isLocaleChange && (componentInfo == null ? void 0 : componentInfo.componentType) === "PAGE") {
-        addPageScript(appProxy, pageProxyRef.current);
-      }
-    }
-    useEffect(() => {
       const newAppLocale = merge({}, i18n.appLocale || {}, (prefabInfo == null ? void 0 : prefabInfo.appLocale) || {});
-      if (!isEqual(pageContext.appLocale, newAppLocale)) {
-        setPageContext((prev) => __spreadProps(__spreadValues({}, prev), {
-          appLocale: newAppLocale
-        }));
-      }
-    }, [i18n.appLocale]);
-    useEffect(() => {
       const localeFormats = {
         date: i18n.dateFormat,
         time: i18n.timeFormat,
         currency: i18n.currencyCode
       };
-      setPageContext((prev) => __spreadProps(__spreadValues({}, prev), {
-        localeFormats
-      }));
       if (pageProxyRef.current) {
+        const appLocaleChanged = !isEqual(pageProxyRef.current.appLocale, newAppLocale);
+        if (appLocaleChanged) {
+          appProxy.appLocale = newAppLocale;
+          pageProxyRef.current.appLocale = newAppLocale;
+          pageProxyRef.current.App.appLocale = newAppLocale;
+        }
         pageProxyRef.current.localeFormats = localeFormats;
         if (pageProxyRef.current.App) {
           pageProxyRef.current.App.localeFormats = localeFormats;
         }
       }
-    }, [i18n.dateFormat, i18n.timeFormat, i18n.currencyCode]);
+      setPageContext((prev) => {
+        const appLocaleChanged = !isEqual(prev.appLocale, newAppLocale);
+        if (prev.selectedLocale === i18n.selectedLocale && !appLocaleChanged) {
+          return __spreadProps(__spreadValues({}, prev), { localeFormats });
+        }
+        return __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, prev), {
+          selectedLocale: i18n.selectedLocale
+        }), isLocaleSwitch && { Widgets: {} }), {
+          appLocale: newAppLocale,
+          localeFormats
+        });
+      });
+    }, [i18n.selectedLocale, i18n.appLocale, i18n.dateFormat, i18n.timeFormat, i18n.currencyCode]);
     const pageName = (appProxy == null ? void 0 : appProxy.activePageName) || "";
     useEffect(() => {
       if ((componentInfo == null ? void 0 : componentInfo.componentType) === "PARTIAL" && pageName) {
@@ -658,7 +620,11 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
     useEffect(() => {
       if (isInitialized && isPageReady && isMountedRef.current && !onStartupCompletedRef.current && pageProxyRef.current) {
         const runStartup = async () => {
+          var _a2;
           if (!isMountedRef.current) return;
+          if ((componentInfo == null ? void 0 : componentInfo.componentType) !== "PAGE") {
+            (_a2 = props.onLoad) == null ? void 0 : _a2.call(props, pageProxyRef.current);
+          }
           if ((securityConfig == null ? void 0 : securityConfig.authenticated) && (appProxy == null ? void 0 : appProxy.executeSessionFailureRequests)) {
             await appProxy.executeSessionFailureRequests();
           }
@@ -702,14 +668,14 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
         ((_a2 = appVariables[value]) == null ? void 0 : _a2.invokeOnParamChange) && ((_b2 = appVariables[value]) == null ? void 0 : _b2.invokeOnParamChange());
       });
     }
-    if (((_e = componentInfo == null ? void 0 : componentInfo.autoUpdateVariables) == null ? void 0 : _e.length) && onStartupCompletedRef.current) {
+    if (((_c = componentInfo == null ? void 0 : componentInfo.autoUpdateVariables) == null ? void 0 : _c.length) && onStartupCompletedRef.current) {
       const pageVariables = pageContext.Variables;
       componentInfo.autoUpdateVariables.forEach((value) => {
         var _a2, _b2;
         (_b2 = (_a2 = pageVariables[value]) == null ? void 0 : _a2.invokeOnParamChange) == null ? void 0 : _b2.call(_a2);
       });
     }
-    return /* @__PURE__ */ jsx(WidgetProvider, { value: { value: pageContext, proxy: pageProxyRef.current }, children: /* @__PURE__ */ jsx(WrappedComponent, __spreadValues({}, props), `locale-${(_f = i18n.localeRevision) != null ? _f : 0}`) });
+    return /* @__PURE__ */ jsx(WidgetProvider, { value: { value: pageContext, proxy: pageProxyRef.current }, children: /* @__PURE__ */ jsx(WrappedComponent, __spreadValues({}, props)) });
   };
   PageContextComponent.displayName = `WithPageContext(${WrappedComponent.displayName || WrappedComponent.name || "Component"})`;
   return PageContextComponent;

package/higherOrder/DataNav.js

@@ -419,13 +419,16 @@ const withDatasetAwareNavigation = (WrappedComponent) => {
       if (!navNodes || navNodes.length === 0) {
         return navNodes;
       }
+      if (!itemid && !binditemid.current) {
+        return navNodes;
+      }
       const currentRouteId = getCurrentRouteId();
       if (!currentRouteId) {
         return [];
       }
       const breadcrumbPath = findPathToNode(navNodes, currentRouteId);
       return breadcrumbPath.length > 0 ? breadcrumbPath : [];
-    }, [navNodes]);
+    }, [navNodes, itemid]);
     return /* @__PURE__ */ jsx(
       WrappedComponent,
       __spreadProps(__spreadValues({}, props), {

package/higherOrder/withBaseWrapper.js

@@ -57,7 +57,6 @@ const withBaseWrapper = (WrappedComponent) => {
       }
     }, [name, pageContext == null ? void 0 : pageContext.Widgets, componentWidgetId, props]);
     const mergedProps = useMemo(() => {
-      var _a2;
       if (!name || !(pageContext == null ? void 0 : pageContext.Widgets) || (props == null ? void 0 : props.iswidget) === "false") {
         return props;
       }
@@ -73,8 +72,8 @@ const withBaseWrapper = (WrappedComponent) => {
         const widgetOverrides = registry == null ? void 0 : registry.getWidgetOverrides(name, componentWidgetId || "");
         if (widgetOverrides) {
           Object.keys(widgetOverrides).forEach((key) => {
-            var _a3;
-            const internalValue = (_a3 = registry == null ? void 0 : registry.getLastInternalValue) == null ? void 0 : _a3.call(registry, name, key);
+            var _a2;
+            const internalValue = (_a2 = registry == null ? void 0 : registry.getLastInternalValue) == null ? void 0 : _a2.call(registry, name, key);
             mergedState[key] = internalValue !== void 0 ? internalValue : widgetOverrides[key];
             if (props.prefab && key !== "inbound" && key !== "outbound" && key !== "show") {
               const updatedInbound = __spreadProps(__spreadValues({}, props.inbound), {
@@ -95,7 +94,7 @@ const withBaseWrapper = (WrappedComponent) => {
           });
         }
       } else if (shouldMergeFromContext) {
-        mergedState = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, widget), props), (props == null ? void 0 : props.formfield) ? { datavalue: props.datavalue } : { datavalue: (_a2 = props.datavalue) != null ? _a2 : widgetDatavalue }), component === "WmFormField" && !props["value"] && { value: datavalue, datavalue });
+        mergedState = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, widget), props), (props == null ? void 0 : props.formfield) ? { datavalue: props.datavalue } : { datavalue: datavalue != null ? datavalue : widgetDatavalue }), component === "WmFormField" && !props["value"] && { value: datavalue, datavalue });
       } else {
         mergedState = __spreadValues(__spreadValues({}, props), component === "WmFormField" && !props["value"] && { value: datavalue, datavalue });
       }

package/hooks/useHttp.js

@@ -157,7 +157,7 @@ class ModernHttpService {
     );
   }
   async send(options, variable) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const serviceInfo = variable.serviceInfo;
     let headers = new AxiosHeaders(options.headers);
     let requestBody = options.data;
@@ -178,8 +178,10 @@ class ModernHttpService {
       url = variable.config.baseUrl + options.url.replace("./", "/");
     } else if (url === (serviceInfo == null ? void 0 : serviceInfo.directPath) && options.url.startsWith("http")) {
       url = options.url;
+    } else if (variable.config.baseUrl.includes("/services") && ((_b = options.url) == null ? void 0 : _b.includes("/services"))) {
+      url = variable.config.baseUrl + ((_c = options.url.replace("./services", "")) == null ? void 0 : _c.replace("./", "/"));
     } else {
-      url = variable.config.baseUrl + ((_b = options.url.replace("./services", "")) == null ? void 0 : _b.replace("./", "/"));
+      url = variable.config.baseUrl + ((_d = options.url) == null ? void 0 : _d.replace("./", "/"));
     }
     if (!options.isDirectCall) {
       headers = headers.set("X-Requested-With", "XMLHttpRequest");

package/hooks/useLayoutSize.js

@@ -3,7 +3,7 @@ import { layoutSizeUtil } from "../utils/layoutsize-util";
 function useLayoutSize(ref, layoutWidth, layoutHeight) {
   useLayoutEffect(() => {
     if (ref.current && (layoutWidth || layoutHeight)) {
-      layoutSizeUtil(ref.current, layoutWidth, layoutHeight);
+      layoutSizeUtil(ref.current, layoutWidth == null ? void 0 : layoutWidth.trim(), layoutHeight == null ? void 0 : layoutHeight.trim());
     }
   }, [layoutWidth, layoutHeight]);
 }