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

package/components/navigation/popover/index.js

@@ -32,6 +32,7 @@ import debounce from "lodash-es/debounce";
 import Popover from "@mui/material/Popover";
 import withBaseWrapper from "../../../higherOrder/withBaseWrapper";
 import { WmAnchor } from "../../basic/anchor";
+import { PopoverContext } from "../../../context/PopoverContext";
 import { DEFAULT_PROPS } from "./props";
 const WmPopover = (Props) => {
   var _a, _b, _c;
@@ -44,6 +45,7 @@ const WmPopover = (Props) => {
   const popoverActionsRef = useRef(null);
   const loadedRef = useRef(false);
   const [open, setOpen] = useState(false);
+  const [keepContentMounted, setKeepContentMounted] = useState(false);
   const isOpen = Boolean(anchorEl);
   const openPopover = useCallback(() => {
     var _a2;
@@ -64,6 +66,16 @@ const WmPopover = (Props) => {
     setIsDialogOpen(false);
     (_a2 = props == null ? void 0 : props.onHide) == null ? void 0 : _a2.call(props, {}, __spreadValues({ isOpen: false }, props));
   }, [isOpen]);
+  const popoverContext = useMemo(
+    () => ({
+      closeForDialog: () => {
+        setKeepContentMounted(true);
+        closePopover();
+      },
+      onDialogClose: () => setKeepContentMounted(false)
+    }),
+    [closePopover]
+  );
   const togglePopover = useCallback(() => {
     if (isOpen) {
       closePopover();
@@ -260,7 +272,7 @@ const WmPopover = (Props) => {
         )
       })
     ),
-    /* @__PURE__ */ jsxs(
+    /* @__PURE__ */ jsx(PopoverContext.Provider, { value: popoverContext, children: /* @__PURE__ */ jsxs(
       Popover,
       {
         action: popoverActionsRef,
@@ -274,6 +286,7 @@ const WmPopover = (Props) => {
           enter: 0,
           exit: 0
         },
+        keepMounted: keepContentMounted,
         disableScrollLock: true,
         disableAutoFocus: true,
         disableEnforceFocus: true,
@@ -288,7 +301,6 @@ const WmPopover = (Props) => {
             },
             className: clsx(
               placement,
-              props.className,
               "app-popover in popover",
               props.contentanimation && `animated ${props.contentanimation}`,
               `popover-${placement}`,
@@ -309,7 +321,7 @@ const WmPopover = (Props) => {
           /* @__PURE__ */ jsx("div", { className: "popover-content popover-body", children: props.render && props.content ? /* @__PURE__ */ jsx(Suspense, { fallback: null, children: props.render(props, (widget) => handleLoad(widget)) }) : props.children })
         ]
       }
-    )
+    ) })
   ] });
 };
 var popover_default = withBaseWrapper(WmPopover);

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

@@ -17,6 +17,7 @@ declare const _default: import("react").ComponentType<{
     width?: number | string;
     height?: number | string;
     className?: string;
+    class?: string;
     conditionalstyle?: import("react").CSSProperties;
     conditionalclass?: string;
     showindevice?: ("xs" | "sm" | "md" | "lg" | "all")[];

package/context/PopoverContext.d.ts

@@ -0,0 +1,5 @@
+export interface PopoverContextValue {
+    closeForDialog: () => void;
+    onDialogClose: () => void;
+}
+export declare const PopoverContext: import("react").Context<PopoverContextValue>;

package/context/PopoverContext.js

@@ -0,0 +1,5 @@
+import { createContext } from "react";
+const PopoverContext = createContext(null);
+export {
+  PopoverContext
+};

package/context/WidgetProvider.js

@@ -35,6 +35,7 @@ import { HttpProvider } from "../hooks/useHttp";
 import { removeWidgetsFromContext } from "../utils/widget-cleanup-util";
 import { EVENTEMITTER_METHODS } from "../core/constants/events";
 import { createWidgetProxy } from "../core/proxy-service";
+import { isPrefabScope, publishPartialNamespaces } from "../utils/partial-host-util";
 import { useLayout } from "./LayoutProvider";
 import isPlainObject from "lodash-es/isPlainObject";
 const WidgetContext = createContext(void 0);
@@ -176,8 +177,14 @@ const WidgetProvider = ({
       var _a2;
       if (!data.pageContext) return;
       if ((_a2 = data.pageContext) == null ? void 0 : _a2.isLayout) return;
-      proxy.Widgets[data.partialName] = data.proxy;
-      if (isAppWidgetRegisterNeeded) proxy.App.Widgets[data.partialName] = data.proxy;
+      const registerHost = (widgets) => {
+        if (!widgets) return;
+        if (isPrefabScope(data.pageContext) || !publishPartialNamespaces(widgets[data.partialName], data.proxy)) {
+          widgets[data.partialName] = data.proxy;
+        }
+      };
+      registerHost(proxy.Widgets);
+      if (isAppWidgetRegisterNeeded) registerHost(proxy.App.Widgets);
     };
     EVENTEMITTER_METHODS.PARTIAL_STATE_SYNC_ON(handlePartialStateSync);
     return () => {

package/core/proxy-service.d.ts

@@ -3,6 +3,8 @@ import { OverriddenPropsRegistry } from "@wavemaker-ai/react-runtime/core/script
 import BaseAppProps from "../higherOrder/BaseAppProps";
 import { FormFieldProps } from "../components/data/form/form-field/props";
 import type { UseFormSetValue } from "react-hook-form";
+/** True when `value` is a built-in that breaks if wrapped in a reactivity Proxy. */
+export declare const isNonProxyableBuiltin: (value: object) => boolean;
 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;

package/core/proxy-service.js

@@ -27,6 +27,32 @@ import { ServiceVariable } from "../variables/service-variable";
 import LiveVariable from "../variables/live-variable";
 import { ModelVariable } from "../variables/model-variable";
 import CrudVariable from "../variables/crud-variable";
+const NON_PROXYABLE_TAGS = /* @__PURE__ */ new Set([
+  "[object AbortController]",
+  "[object AbortSignal]",
+  "[object ArrayBuffer]",
+  "[object Blob]",
+  "[object Date]",
+  "[object Error]",
+  "[object File]",
+  "[object FileList]",
+  "[object FormData]",
+  "[object Headers]",
+  "[object Map]",
+  "[object Promise]",
+  "[object RegExp]",
+  "[object Request]",
+  "[object Response]",
+  "[object Set]",
+  "[object SharedArrayBuffer]",
+  "[object URL]",
+  "[object URLSearchParams]",
+  "[object WeakMap]",
+  "[object WeakRef]",
+  "[object WeakSet]"
+]);
+const isNonProxyableBuiltin = (value) => NON_PROXYABLE_TAGS.has(Object.prototype.toString.call(value)) || // Covers every TypedArray flavour plus DataView in one check.
+ArrayBuffer.isView(value);
 const proxyMap = /* @__PURE__ */ new WeakMap();
 const pageWidgetProxyCaches = /* @__PURE__ */ new WeakMap();
 function clearPageWidgetProxyCache(widgetsProxy) {
@@ -209,6 +235,7 @@ const createWidgetProxy = (widget, widgetName, setPageContext, overriddenPropsRe
   widget.__isProxy = true;
   const proxy = new Proxy(widget, {
     set(target, prop, value, receiver) {
+      var _a;
       if (typeof prop === "symbol" || prop === "prototype") {
         return Reflect.set(target, prop, value, receiver);
       }
@@ -224,10 +251,21 @@ const createWidgetProxy = (widget, widgetName, setPageContext, overriddenPropsRe
       }
       Reflect.set(target, prop, value, receiver);
       queueBatchedWidgetContextUpdate(widgetName, widget, prop, value, setPageContext);
+      if (prop === "className") {
+        Reflect.set(target, "class", value);
+        (_a = overriddenPropsRegistry == null ? void 0 : overriddenPropsRegistry.trackOverriddenProps) == null ? void 0 : _a.call(
+          overriddenPropsRegistry,
+          widgetName,
+          "class",
+          value,
+          widget["data-widget-id"]
+        );
+        queueBatchedWidgetContextUpdate(widgetName, widget, "class", value, setPageContext);
+      }
       return true;
     },
     get(target, prop, receiver) {
-      var _a;
+      var _a, _b, _c, _d;
       if (typeof prop === "symbol" || prop === "prototype") {
         return Reflect.get(target, prop, receiver);
       }
@@ -302,6 +340,10 @@ const createWidgetProxy = (widget, widgetName, setPageContext, overriddenPropsRe
         );
         return internalValue !== void 0 ? internalValue : widgetOverrides[prop];
       }
+      if (prop === "class" || prop === "className") {
+        const resolved = (_d = (_c = (_b = widgetOverrides == null ? void 0 : widgetOverrides.class) != null ? _b : Reflect.get(target, "class", receiver)) != null ? _c : widgetOverrides == null ? void 0 : widgetOverrides.className) != null ? _d : Reflect.get(target, "className", receiver);
+        return resolved != null ? resolved : "";
+      }
       if (isDOMElement(value)) {
         return value;
       }
@@ -487,7 +529,7 @@ const createStateProxy = (obj, path = [], setPageContext, overriddenPropsRegistr
       if (isDOMElement(value)) {
         return value;
       }
-      if (value instanceof Map || value instanceof Date) {
+      if (isNonProxyableBuiltin(value)) {
         return value;
       }
       if (Array.isArray(value)) {
@@ -606,5 +648,6 @@ export {
   createWidgetProxy,
   defineFieldAlias,
   getFormFieldEntries,
-  getFormFieldList
+  getFormFieldList,
+  isNonProxyableBuiltin
 };

package/higherOrder/BaseApp.js

@@ -79,7 +79,8 @@ const BaseApp = (WrappedComponent, addAppScript, getAppVariables, appInfo = {})
       subscribe,
       targetPlatform: "WEB",
       hasOwnObjectProperty,
-      formatters
+      formatters,
+      i18nService
     }), appInfo), i18nServiceActions), i18nService));
     const appProxyRef = useRef(null);
     const sessionFailureRequestsRef = useRef([]);

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
         });
@@ -610,11 +607,7 @@ 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(() => {

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

@@ -67,7 +67,7 @@ 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) {
@@ -141,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";