@wavemaker-ai/react-runtime 1.0.0-rc.324 → 1.0.0-rc.326

package/higherOrder/withBaseWrapper.js

@@ -30,7 +30,7 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import { jsx } from "react/jsx-runtime";
+import { createElement } from "react";
 import React, { useEffect, useMemo, useCallback } from "react";
 import isEqual from "lodash-es/isEqual";
 import { useDeviceVisibility } from "../hooks/useDeviceVisibility";
@@ -48,7 +48,7 @@ const withBaseWrapper = (WrappedComponent) => {
     useEffect(() => {
       if (name && (props == null ? void 0 : props.iswidget) !== "false" && (pageContext == null ? void 0 : pageContext.Widgets)) {
         const widget = (widgetFromContext == null ? void 0 : widgetFromContext["data-widget-id"]) === componentWidgetId ? widgetFromContext : {};
-        const registryEntry = __spreadProps(__spreadValues(__spreadValues({}, props), widget), {
+        const registryEntry = __spreadProps(__spreadValues(__spreadValues({}, widget), props), {
           "data-widget-id": componentWidgetId || void 0,
           // Ensure widget-id is stored
           viewParent: proxy
@@ -57,6 +57,7 @@ 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;
       }
@@ -72,8 +73,8 @@ const withBaseWrapper = (WrappedComponent) => {
         const widgetOverrides = registry == null ? void 0 : registry.getWidgetOverrides(name, componentWidgetId || "");
         if (widgetOverrides) {
           Object.keys(widgetOverrides).forEach((key) => {
-            var _a2;
-            const internalValue = (_a2 = registry == null ? void 0 : registry.getLastInternalValue) == null ? void 0 : _a2.call(registry, name, key);
+            var _a3;
+            const internalValue = (_a3 = registry == null ? void 0 : registry.getLastInternalValue) == null ? void 0 : _a3.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), {
@@ -94,7 +95,7 @@ const withBaseWrapper = (WrappedComponent) => {
           });
         }
       } else if (shouldMergeFromContext) {
-        mergedState = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, widget), props), (props == null ? void 0 : props.formfield) ? { datavalue: props.datavalue } : { datavalue: widgetDatavalue != null ? widgetDatavalue : props.datavalue }), component === "WmFormField" && !props["value"] && { value: datavalue, datavalue });
+        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 });
       } else {
         mergedState = __spreadValues(__spreadValues({}, props), component === "WmFormField" && !props["value"] && { value: datavalue, datavalue });
       }
@@ -153,7 +154,7 @@ const withBaseWrapper = (WrappedComponent) => {
     }
     const shouldHide = !showValue && !isDeferLoad;
     const updateon = (props == null ? void 0 : props.updateon) === "default" ? "keypress" : props == null ? void 0 : props.updateon;
-    return /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ createElement(
       WrappedComponent,
       __spreadProps(__spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, rest), mergedProps), updateon && { updateon }), shouldHide && { hidden: true }), deferload !== void 0 && { deferload: deferload.toString() }), {
         show: (_d = mergedProps == null ? void 0 : mergedProps.show) == null ? void 0 : _d.toString(),
@@ -162,7 +163,8 @@ const withBaseWrapper = (WrappedComponent) => {
         styles: computedStyles
       }), (props == null ? void 0 : props.dataset) && { dataset: props == null ? void 0 : props.dataset }), {
         destroy,
-        viewParent: proxy
+        viewParent: proxy,
+        key: (pageContext == null ? void 0 : pageContext.selectedLocale) || "en"
       })
     );
   };