@wavemaker-ai/react-runtime 1.0.0-rc.330 → 1.0.0-rc.334

package/higherOrder/BasePage.js

@@ -259,10 +259,7 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
         pageProxyRef.current.Variables = updatedVariables;
         pageProxyRef.current.Actions = updatedActions;
         return __spreadProps(__spreadValues({}, prev), {
-          App: __spreadProps(__spreadValues({}, prev.App), {
-            Variables: appContext.Variables || {},
-            Actions: appContext.Actions || {}
-          }),
+          App: appProxy != null ? appProxy : prev.App,
           Variables: updatedVariables,
           Actions: updatedActions
         });
@@ -274,7 +271,6 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
       }
       isInitializingRef.current = true;
       const initializeComponent = async () => {
-        var _a2;
         try {
           overriddenPropsRegistryRef.current = createOverriddenPropsRegistry();
           const pageProxy = createStateProxy(
@@ -304,7 +300,6 @@ 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) {
@@ -391,6 +386,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(() => {
@@ -609,17 +607,17 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
     const pageName = (appProxy == null ? void 0 : appProxy.activePageName) || "";
     useEffect(() => {
       if ((componentInfo == null ? void 0 : componentInfo.componentType) === "PARTIAL" && pageName) {
-        setPageContext((prev) => __spreadProps(__spreadValues({}, prev), {
-          App: __spreadProps(__spreadValues({}, prev.App), {
-            activePageName: pageName
-          })
-        }));
+        setPageContext((prev) => __spreadValues({}, prev));
       }
     }, [pageName]);
     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();
           }

package/higherOrder/props.d.ts

@@ -15,6 +15,7 @@ export interface Props {
     width?: number | string;
     height?: number | string;
     className?: string;
+    class?: string;
     conditionalstyle?: CSSProperties;
     conditionalclass?: string;
     showindevice?: ("xs" | "sm" | "md" | "lg" | "all")[];

package/higherOrder/useActivePageReactivity.js

@@ -1,7 +1,5 @@
 "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;
@@ -17,7 +15,6 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { useEffect, useRef } from "react";
 import { EVENTEMITTER_METHODS } from "../core/constants/events";
 const resolvePath = (root, path) => path.split(".").reduce((obj, key) => obj == null ? void 0 : obj[key], root);
@@ -41,7 +38,7 @@ const useActivePageReactivity = ({
       const next = readValues();
       if (next.some((value, i) => !Object.is(value, snapshotRef.current[i]))) {
         snapshotRef.current = next;
-        setPageContext((prev) => __spreadProps(__spreadValues({}, prev), { App: __spreadValues({}, prev.App) }));
+        setPageContext((prev) => __spreadValues({}, prev));
       }
     };
     EVENTEMITTER_METHODS.ACTIVE_PAGE_SYNC_ON(onActivePageChange);

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;
       }
@@ -68,13 +67,13 @@ const withBaseWrapper = (WrappedComponent) => {
       let mergedState = __spreadValues({}, props);
       const registry = pageContext == null ? void 0 : pageContext.overriddenPropsRegistry;
       const widgetDatavalue = widget.datavalue;
-      const datavalue = widgetDatavalue != null ? widgetDatavalue : props.datavalue;
+      const datavalue = props["item-id"] ? props.datavalue : widgetDatavalue != null ? widgetDatavalue : props.datavalue;
       if (shouldMergeFromContext && (registry == null ? void 0 : registry.isWidgetOverridden(name, componentWidgetId || "")) && !props.formfield) {
         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 });
       }
@@ -142,10 +141,11 @@ const withBaseWrapper = (WrappedComponent) => {
     const computedClassName = useMemo(() => {
       return [
         props.className,
+        mergedProps.class,
         props.conditionalclass,
         props.animation && `animated ${props.animation}`
       ].filter(Boolean).join(" ");
-    }, [props.className, props.conditionalclass, props.animation]);
+    }, [props.className, mergedProps.class, props.conditionalclass, props.animation]);
     if (isHidden) return null;
     const isDeferLoad = deferload === true;
     const showValue = ((_c = mergedProps == null ? void 0 : mergedProps.show) == null ? void 0 : _c.toString()) !== "false";