@wavemaker-ai/react-runtime 1.0.0-rc.317 → 1.0.0-rc.322

package/components/input/epoch/time/index.js

@@ -79,18 +79,19 @@ const WmTime = (props) => {
   );
   const handleTimeChange = useCallback(
     (newTime, event2, shouldClosePicker = false) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       if (!newTime) {
         const oldValue = displayValue;
         setInternalValue(null);
         setDisplayValue("");
         setValidationResult({ isValid: true });
         invokeOnChange == null ? void 0 : invokeOnChange("", { $event: event2, type: "change" });
-        if (name && (listener == null ? void 0 : listener.Widgets[name])) {
+        if (name && ((_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name])) {
           listener.Widgets[name].displayValue = "";
         }
         updateListener(name, listener, props, "", null, "");
-        if (onChange && name && (listener == null ? void 0 : listener.Widgets[name])) {
-          onChange(event2, listener == null ? void 0 : listener.Widgets[name], "", oldValue);
+        if (onChange && name && ((_b = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _b[name])) {
+          onChange(event2, (_c = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _c[name], "", oldValue);
         }
         if (shouldClosePicker) setShowPicker == null ? void 0 : setShowPicker(false);
         return;
@@ -109,7 +110,7 @@ const WmTime = (props) => {
         const outputFormattedValue = formatDisplayTimeValue(newTime, outputformat);
         setDisplayValue(formattedValue);
         invokeOnChange == null ? void 0 : invokeOnChange(outputFormattedValue, { $event: event2, type: "change" });
-        if (name && (listener == null ? void 0 : listener.Widgets[name])) {
+        if (name && ((_d = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _d[name])) {
           listener.Widgets[name].displayValue = formattedValue;
         }
         updateListener(
@@ -120,13 +121,13 @@ const WmTime = (props) => {
           formatDisplayTimeValue(newTime, "timestamp"),
           outputFormattedValue
         );
-        if (onChange && name && (listener == null ? void 0 : listener.Widgets[name])) {
-          onChange(event2, name && (listener == null ? void 0 : listener.Widgets[name]), outputFormattedValue, displayValue);
+        if (onChange && name && ((_e = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _e[name])) {
+          onChange(event2, name && ((_f = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _f[name]), outputFormattedValue, displayValue);
         }
       } else {
         const formattedValue = formatDisplayTimeValue(newTime, timepattern);
-        if (onChange && name && (listener == null ? void 0 : listener.Widgets[name]) && props.formfield) {
-          onChange(event2, name && (listener == null ? void 0 : listener.Widgets[name]), formattedValue, displayValue);
+        if (onChange && name && ((_g = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _g[name]) && props.formfield) {
+          onChange(event2, name && ((_h = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _h[name]), formattedValue, displayValue);
         }
       }
       if (shouldClosePicker) setShowPicker == null ? void 0 : setShowPicker(false);
@@ -166,6 +167,7 @@ const WmTime = (props) => {
   }, [setShowPicker]);
   const handleInputChange = useCallback(
     (event2) => {
+      var _a, _b, _c, _d;
       try {
         const inputValue = event2.target.value;
         if (!inputValue) {
@@ -180,8 +182,8 @@ const WmTime = (props) => {
         );
         if (!formatValidation.isValid) {
           setValidationResult(formatValidation);
-          if (onChange && name && (listener == null ? void 0 : listener.Widgets[name]) && props.formfield) {
-            onChange(event2, listener == null ? void 0 : listener.Widgets[name], inputValue, displayValue);
+          if (onChange && name && ((_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]) && props.formfield) {
+            onChange(event2, (_b = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _b[name], inputValue, displayValue);
           }
           setDisplayValue(inputValue);
           return;
@@ -199,8 +201,8 @@ const WmTime = (props) => {
           if (rangeValidation.isValid) {
             handleTimeChange(parsedTime.toDate(), event2, false);
           } else {
-            if (onChange && name && (listener == null ? void 0 : listener.Widgets[name]) && props.formfield) {
-              onChange(event2, listener == null ? void 0 : listener.Widgets[name], inputValue, displayValue);
+            if (onChange && name && ((_c = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _c[name]) && props.formfield) {
+              onChange(event2, (_d = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _d[name], inputValue, displayValue);
             }
             setDisplayValue(inputValue);
           }
@@ -227,6 +229,7 @@ const WmTime = (props) => {
   );
   const handleClick = useCallback(
     (event2) => {
+      var _a;
       try {
         if (disabled || readonly || isCurrentTime) return;
         if (anchorRef.current && !anchorRef.current.contains(document.activeElement)) {
@@ -236,7 +239,7 @@ const WmTime = (props) => {
           setShowPicker == null ? void 0 : setShowPicker(true);
         }
         if (onClick && name) {
-          onClick(event2, listener == null ? void 0 : listener.Widgets[name]);
+          onClick(event2, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
         }
       } catch (error) {
         console.error("Error in handleClick:", error);
@@ -321,7 +324,7 @@ const WmTime = (props) => {
         } else if (datavalue instanceof Date) {
           parsed = moment(datavalue);
         } else {
-          parsed = moment(datavalue, timepattern, true);
+          parsed = moment(parseTimeValue(datavalue, timepattern), timepattern, true);
         }
         setInternalValue(parsed);
         if (parsed.isValid()) {
@@ -388,7 +391,10 @@ const WmTime = (props) => {
         value: displayValue,
         onChange: handleInputChange,
         onClick: handleClick,
-        onFocus: (event2) => onFocus && name && onFocus(event2, listener == null ? void 0 : listener.Widgets[name]),
+        onFocus: (event2) => {
+          var _a;
+          return onFocus && name && onFocus(event2, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
+        },
         onBlur: (event2) => {
           var _a;
           return onBlur && name && ((_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]) ? onBlur(event2, listener.Widgets[name]) : void 0;

package/components/input/fileupload/index.d.ts

@@ -88,5 +88,7 @@ declare const _default: React.ComponentType<{
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/number/index.d.ts

@@ -69,6 +69,8 @@ declare const WmNumberStandalone: React.ComponentType<import("../../data/form/fo
     formfield?: boolean;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 } & import("@wavemaker-ai/react-runtime/higherOrder/withStandalone").WithStandaloneProps>;
 export { WmNumberStandalone as WmNumber };
 /**
@@ -160,5 +162,7 @@ declare const _default: React.ComponentType<{
     formfield?: boolean;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/number/index.js

@@ -347,12 +347,13 @@ const WmNumber = memo(
       }
     }, [initialDataValue, initialMaxDataValue, initialMaxValue, isMaxWidget]);
     useEffect(() => {
+      var _a;
       if (inputEl.current) {
         const focus = () => {
-          var _a;
-          (_a = inputEl.current) == null ? void 0 : _a.focus();
+          var _a2;
+          (_a2 = inputEl.current) == null ? void 0 : _a2.focus();
         };
-        if (listener == null ? void 0 : listener.Widgets[name]) {
+        if ((_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]) {
           listener.Widgets[name].focus = focus;
         }
       }

package/components/input/rating/index.d.ts

@@ -91,6 +91,8 @@ declare const WmRatingStandalone: React.ComponentType<import("../../data/form/fo
     formfield?: boolean;
     updateon?: string;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 } & import("@wavemaker-ai/react-runtime/higherOrder/withStandalone").WithStandaloneProps>;
 export { WmRatingStandalone as WmRating };
 /**
@@ -204,5 +206,7 @@ declare const _default: React.ComponentType<{
     formfield?: boolean;
     updateon?: string;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/select/index.d.ts

@@ -73,6 +73,8 @@ declare const WmSelectStandalone: React.ComponentType<import("../../data/form/fo
     formfield?: boolean;
     updateon?: string;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 } & import("@wavemaker-ai/react-runtime/higherOrder/withStandalone").WithStandaloneProps>;
 export { WmSelectStandalone as WmSelect };
 /**
@@ -169,5 +171,7 @@ declare const _default: React.ComponentType<{
     formfield?: boolean;
     updateon?: string;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/slider/index.d.ts

@@ -67,6 +67,8 @@ declare const WmSliderStandalone: React.ComponentType<import("../../data/form/fo
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 } & import("@wavemaker-ai/react-runtime/higherOrder/withStandalone").WithStandaloneProps>;
 export { WmSliderStandalone as WmSlider };
 /**
@@ -158,5 +160,7 @@ declare const _default: React.ComponentType<{
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/slider/index.js

@@ -83,9 +83,10 @@ const WmSlider = memo(
     );
     const handleInputChange = useCallback(
       (event) => {
+        var _a;
         const newVal = Number(event.target.value);
         setValue(newVal);
-        if (listener == null ? void 0 : listener.Widgets[name]) {
+        if ((_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]) {
           listener.Widgets[name].displayValue = newVal;
         }
         if (onChange) {
@@ -172,10 +173,11 @@ const WmSlider = memo(
     }, [props.minvalue, props.maxvalue, step, markerlabeltext, showmarkers]);
     const applyValue = useCallback(
       (newVal) => {
+        var _a;
         const oldVal = prevDatavalueRef.current;
         setValue(newVal);
         prevDatavalueRef.current = newVal;
-        if (listener == null ? void 0 : listener.Widgets[name]) {
+        if ((_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]) {
           listener.Widgets[name].displayValue = newVal;
         }
         if (onChange) {

package/components/input/text/index.d.ts

@@ -76,6 +76,8 @@ declare const WmTextStandalone: import("react").ComponentType<import("../../data
     formfield?: boolean;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 } & import("@wavemaker-ai/react-runtime/higherOrder/withStandalone").WithStandaloneProps>;
 export { WmTextStandalone as WmText };
 /**
@@ -173,5 +175,7 @@ declare const _default: import("react").ComponentType<{
     formfield?: boolean;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/text/index.js

@@ -289,6 +289,7 @@ const WmText = memo(
       }
     };
     const handleBlur = (e) => {
+      var _a;
       if (readonly || disabled) {
         return;
       }
@@ -306,14 +307,16 @@ const WmText = memo(
         setIsTouched(true);
         setIsDirty(true);
       }
-      onBlur == null ? void 0 : onBlur(e, listener == null ? void 0 : listener.Widgets[name]);
+      onBlur == null ? void 0 : onBlur(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
     };
     const handleFocus = (e) => {
-      onFocus == null ? void 0 : onFocus(e, listener == null ? void 0 : listener.Widgets[name]);
+      var _a;
+      onFocus == null ? void 0 : onFocus(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
     };
     const handleKeyDown = (e) => {
       delay(() => {
-        onKeydown == null ? void 0 : onKeydown(e, listener == null ? void 0 : listener.Widgets[name]);
+        var _a;
+        onKeydown == null ? void 0 : onKeydown(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
         if (e.key === "Enter") {
           debouncedUpdateValue(rawValue);
         }
@@ -321,24 +324,29 @@ const WmText = memo(
     };
     const handleKeyPress = (e) => {
       delay(() => {
-        onKeypress == null ? void 0 : onKeypress(e, listener == null ? void 0 : listener.Widgets[name]);
+        var _a;
+        onKeypress == null ? void 0 : onKeypress(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
       }, 0);
     };
     const handleKeyUp = (e) => {
       delay(() => {
-        onKeyup == null ? void 0 : onKeyup(e, listener == null ? void 0 : listener.Widgets[name]);
+        var _a;
+        onKeyup == null ? void 0 : onKeyup(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
       }, 0);
     };
     const handleLeadingIconClick = (e) => {
+      var _a;
       e.preventDefault();
-      onLeadingiconclick == null ? void 0 : onLeadingiconclick(e, listener == null ? void 0 : listener.Widgets[name]);
+      onLeadingiconclick == null ? void 0 : onLeadingiconclick(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
     };
     const handleTrailingIconClick = (e) => {
+      var _a;
       e.preventDefault();
-      onTrailingiconclick == null ? void 0 : onTrailingiconclick(e, listener == null ? void 0 : listener.Widgets[name]);
+      onTrailingiconclick == null ? void 0 : onTrailingiconclick(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
     };
     const handleMouseEnter = (e) => {
-      onMouseEnter == null ? void 0 : onMouseEnter(e, listener == null ? void 0 : listener.Widgets[name]);
+      var _a;
+      onMouseEnter == null ? void 0 : onMouseEnter(e, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
       setIsTouched(true);
     };
     const events = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({

package/components/input/textarea/index.d.ts

@@ -63,6 +63,8 @@ declare const WmTextareaStandalone: React.ComponentType<import("../../data/form/
     formfield?: boolean;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 } & import("@wavemaker-ai/react-runtime/higherOrder/withStandalone").WithStandaloneProps>;
 export { WmTextareaStandalone as WmTextarea };
 /**
@@ -147,5 +149,7 @@ declare const _default: React.ComponentType<{
     formfield?: boolean;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/upload/index.d.ts

@@ -58,6 +58,8 @@ declare const WithForm: React.NamedExoticComponent<import("../../data/form/form-
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 /**
  * The WmUpload component provides a file upload input for form fields with blob support.
@@ -138,5 +140,7 @@ declare const _default: React.ComponentType<{
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/input/upload/index.js

@@ -45,7 +45,7 @@ const WmUpload = memo(
     const prevDatavalue = useRef(datavalue);
     const isImage = (formField == null ? void 0 : formField.filetype) === "image";
     const handleFileChange = (event) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const file = ((_a = event.target.files) == null ? void 0 : _a[0]) || null;
       if (type === "file") {
         (_b = listener == null ? void 0 : listener.onChange) == null ? void 0 : _b.call(listener, props.fieldName || props.name, {
@@ -59,7 +59,7 @@ const WmUpload = memo(
       if (onChange) {
         onChange(
           event,
-          listener == null ? void 0 : listener.Widgets[name],
+          (_d = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _d[name],
           type === "file" ? file : event.target.value,
           prevDatavalue.current
         );
@@ -67,13 +67,15 @@ const WmUpload = memo(
       prevDatavalue.current = file;
     };
     const handleFileFocus = (event) => {
+      var _a;
       if (onFocus) {
-        onFocus(event, listener == null ? void 0 : listener.Widgets[name]);
+        onFocus(event, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
       }
     };
     const handleFileBlur = (event) => {
+      var _a;
       if (onBlur) {
-        onBlur(event, listener == null ? void 0 : listener.Widgets[name]);
+        onBlur(event, (_a = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _a[name]);
       }
     };
     const renderExistingFile = useCallback(() => {

package/components/navbar/index.d.ts

@@ -63,6 +63,8 @@ declare const _default: import("react").MemoExoticComponent<import("react").Comp
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
     title?: string;
     brandHref?: string;
     showToggle?: boolean;

package/components/navbar/nav/index.d.ts

@@ -86,5 +86,7 @@ declare const _default: import("react").MemoExoticComponent<import("react").Comp
     formfield?: boolean;
     updateon?: string;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>>;
 export default _default;

package/components/navbar/nav-item/index.d.ts

@@ -59,5 +59,7 @@ declare const _default: import("react").MemoExoticComponent<import("react").Comp
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>>;
 export default _default;

package/components/navigation/breadcrumb/index.d.ts

@@ -62,5 +62,7 @@ declare const _default: React.ComponentType<{
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/navigation/menu/index.d.ts

@@ -31,6 +31,7 @@ declare const _default: React.ComponentType<{
     type?: "button" | "anchor";
     prefabName?: string;
     key?: string;
+    loading?: boolean;
     id?: string;
     caption?: string;
     ref?: React.RefObject<HTMLElement> | React.RefObject<null>;
@@ -73,6 +74,7 @@ declare const _default: React.ComponentType<{
     formfield?: boolean;
     updateon?: string;
     dataset?: any;
+    showSkeleton?: boolean;
     orderby?: string;
     iconclass?: string;
     onSelect?: ($event: React.MouseEvent<HTMLElement>, widget: any, $item: any) => void;

package/components/navigation/menu/index.js

@@ -366,7 +366,7 @@ const WmMenu = memo((props) => {
   );
   const handleMenuItemClick = useCallback(
     (event, item) => {
-      var _a2, _b2, _c2, _d, _e;
+      var _a2, _b2, _c2, _d, _e, _f;
       event = event.nativeEvent;
       const { label, icon, link } = getNodeProperties(item);
       if (item.children && item.children.length > 0 || !link || link === "#") {
@@ -396,7 +396,7 @@ const WmMenu = memo((props) => {
       if (isFromNav && onNavItemActivate) {
         onNavItemActivate();
       }
-      if (name && (listener == null ? void 0 : listener.Widgets[name])) {
+      if (name && ((_f = listener == null ? void 0 : listener.Widgets) == null ? void 0 : _f[name])) {
         listener.Widgets[name].displayValue = label;
       }
       if (listener == null ? void 0 : listener.onChange) {

package/components/navigation/popover/index.d.ts

@@ -93,5 +93,7 @@ declare const _default: React.ComponentType<{
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/components/page/partial/index.d.ts

@@ -57,5 +57,7 @@ declare const _default: import("react").ComponentType<{
     updateon?: string;
     dataset?: any;
     prefabName?: string;
+    loading?: boolean;
+    showSkeleton?: boolean;
 }>;
 export default _default;

package/context/AppContext.d.ts

@@ -6,4 +6,6 @@ interface AppProviderProps {
 declare const AppContext: import("react").Context<AppProviderProps>;
 export declare const useAppContext: () => BaseAppProps;
 export declare const useAppProxy: () => any;
+export declare const useAppNotificationAction: () => any;
+export declare const useNotifyApp: () => any;
 export default AppContext;

package/context/AppContext.js

@@ -1,4 +1,5 @@
 import { createContext, useContext } from "react";
+import get from "lodash-es/get";
 const AppContext = createContext(void 0);
 const useAppContext = () => {
   var _a;
@@ -16,9 +17,27 @@ const useAppProxy = () => {
   }
   return context;
 };
+const useAppNotificationAction = () => {
+  var _a;
+  const context = (_a = useContext(AppContext)) == null ? void 0 : _a.proxy;
+  if (context === void 0) {
+    throw new Error("useNotificationAction must be used within an AppProvider");
+  }
+  return get(context, "Actions.appNotification", null);
+};
+const useNotifyApp = () => {
+  var _a;
+  const context = (_a = useContext(AppContext)) == null ? void 0 : _a.proxy;
+  if (context === void 0) {
+    throw new Error("useNotifyApp must be used within an AppProvider");
+  }
+  return context.notifyApp;
+};
 var AppContext_default = AppContext;
 export {
   AppContext_default as default,
   useAppContext,
-  useAppProxy
+  useAppNotificationAction,
+  useAppProxy,
+  useNotifyApp
 };

package/context/WidgetProvider.js

@@ -32,7 +32,6 @@ import get from "lodash-es/get";
 import debounce from "lodash-es/debounce";
 import { useDebounceCallback } from "../hooks/useDebounce";
 import { HttpProvider } from "../hooks/useHttp";
-import { registerFormField, registerFormFieldSafe } from "../utils/form-state.util";
 import { removeWidgetsFromContext } from "../utils/widget-cleanup-util";
 import { EVENTEMITTER_METHODS } from "../core/constants/events";
 import { createWidgetProxy } from "../core/proxy-service";
@@ -100,7 +99,6 @@ const WidgetProvider = ({
               setPageContext,
               registry
             );
-            registerFormField(newContext.Widgets, widgetProxy, incomingWidget, newContext);
             registerMethod(newContext, widgetProxy, widgetName);
           }
         });
@@ -159,7 +157,6 @@ const WidgetProvider = ({
           pageContext.App.Widgets[widgetName] = props;
         }
       }
-      registerFormFieldSafe(pageContext.Widgets, props);
     };
   }, [isAppWidgetRegisterNeeded]);
   const debouncedEmitRef = useRef(

package/core/proxy-service.d.ts

@@ -1,6 +1,8 @@
 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";
 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;

package/core/proxy-service.js

@@ -500,7 +500,32 @@ const createStateProxy = (obj, path = [], setPageContext, overriddenPropsRegistr
     }
   });
 };
+const createFormFieldProxy = (formField, setState, overriddenItemsRef, formProxy) => {
+  const fieldProxy = new Proxy(formField, {
+    get: (target, prop) => {
+      return target[prop];
+    },
+    set: (target, prop, value) => {
+      target[prop] = value;
+      overriddenItemsRef.current[prop] = value;
+      setState(__spreadValues({}, target));
+      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;
+  return fieldProxy;
+};
 export {
+  createFormFieldProxy,
   createPageProxy,
   createStateProxy,
   createWidgetProxy

package/higherOrder/BaseApp.js

@@ -373,9 +373,6 @@ const BaseApp = (WrappedComponent, addAppScript, getAppVariables, appInfo = {})
           renderPartial: (props2, onLoad) => /* @__PURE__ */ jsx(
             WmPartialContainer,
             {
-              onRender: (commonComponent) => {
-                appProxyRef.current.Common = commonComponent;
-              },
               onLoad,
               "data-widget-id": "common-partial-container",
               content: props2.content,
@@ -413,6 +410,7 @@ const BaseApp = (WrappedComponent, addAppScript, getAppVariables, appInfo = {})
       wmSetDependency("metadata", metadataService);
       wmSetDependency("appManager", {
         notify,
+        notifyApp,
         pushToSessionFailureRequests,
         executeSessionFailureRequests,
         handle401

package/higherOrder/BaseAppProps.d.ts

@@ -12,7 +12,6 @@ export interface BaseAppProps {
     isAppReady: boolean;
     changeLocale: (locale: string) => void;
     selectedLocale: string;
-    appLocale?: any;
     /** Locale bundle–style formats; synced from Redux `i18n`. */
     localeFormats: LocaleFormatsProxy;
     getDependency: (name: string) => any;
@@ -34,5 +33,6 @@ export interface BaseAppProps {
     Widgets?: Record<string, ProxyTarget>;
     subscribe: (eventName: string, callback: Function) => () => void;
     autoUpdateVariables: string[];
+    appLocale?: Record<string, any>;
 }
 export default BaseAppProps;

package/higherOrder/BasePage.js

@@ -309,9 +309,11 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
             appProxy.updateActivePage(pageName2);
             appProxy.activePage = pageProxy;
             appProxy.activePageName = pageName2;
-            Object.assign(appProxy.Widgets, pageProxy.Widgets);
+            Object.setPrototypeOf(appProxy.Widgets, pageProxy.Widgets);
           } else if ((componentInfo == null ? void 0 : componentInfo.componentName) === "Common" && (componentInfo == null ? void 0 : componentInfo.componentType) === "PARTIAL" && appProxy) {
-            Object.assign(appProxy.Widgets, pageProxy.Widgets);
+            Object.keys(pageProxy.Widgets).forEach((key) => {
+              appProxy.Widgets[key] = pageProxy.Widgets[key];
+            });
           }
           addPageScript(appProxy, pageProxy);
           wrapWithThirdPartyErrorGuard(