datastake-daf 0.6.485 → 0.6.487

package/dist/components/index.js

@@ -12390,26 +12390,7 @@ function ComponentWithFocus(_ref) {
         }
       }
     }
-  }, [placeholderIsVisible, unFocus] // Add unFocus to dependencies
-  );
-
-  // Add wheel event handler
-  const handleWheel = React.useCallback(() => {
-    if (placeholderIsVisible) {
-      setPlaceholderIsVisible(false);
-    }
   }, [placeholderIsVisible]);
-  React.useEffect(() => {
-    document.addEventListener("mousemove", checkMouse);
-    return () => document.removeEventListener("mousemove", checkMouse); // Fix typo
-  }, [checkMouse]);
-  React.useEffect(() => {
-    if (ref.current) {
-      const element = ref.current;
-      element.addEventListener("wheel", handleWheel);
-      return () => element.removeEventListener("wheel", handleWheel);
-    }
-  }, [handleWheel]);
   React.useEffect(() => {
     document.addEventListener("mousemove", checkMouse);
     return () => document.removeEventListener("mousemov", checkMouse);
@@ -42927,6 +42908,15 @@ const checkCondition = (condition, repeatValues, formsValue) => {
 };
 function showHideInput(input, formsValue, repeatIndex, repeatValues, setValues, ref) {
   if (input?.meta?.hidden === true) {
+    // Set default value for hidden fields
+    if (input?.meta?.defaultValue !== undefined && !propHasValue(formsValue[ref])) {
+      formsValue[ref] = input.meta.defaultValue;
+      if (setValues && typeof setValues === 'function') {
+        setValues({
+          ...formsValue
+        });
+      }
+    }
     return false;
   }
   if (input.showIf) {
@@ -45413,6 +45403,34 @@ function DynamicForm(_ref) {
       //   MainForm.resetFields();
     }
   }, [data]);
+
+  // Initialize default values for hidden fields
+  React.useEffect(() => {
+    if (Object.keys(form).length > 0) {
+      const updatedValues = _objectSpread2({}, values);
+      let hasChanges = false;
+
+      // Process all form fields to set default values for hidden fields
+      Object.keys(form).forEach(formKey => {
+        Object.keys(form[formKey]).forEach(fieldKey => {
+          var _field$meta, _field$meta2;
+          const field = form[formKey][fieldKey];
+          if ((field === null || field === void 0 || (_field$meta = field.meta) === null || _field$meta === void 0 ? void 0 : _field$meta.hidden) === true && (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.defaultValue) !== undefined) {
+            const fieldId = field.dataId || fieldKey;
+            if (!propHasValue(updatedValues[fieldId])) {
+              updatedValues[fieldId] = field.meta.defaultValue;
+              hasChanges = true;
+            }
+          }
+        });
+      });
+      if (hasChanges) {
+        setValues(updatedValues);
+        // Also set the values in the Ant Design form
+        MainForm.setFieldsValue(updatedValues);
+      }
+    }
+  }, [form]);
   const setSelectedForm = id => {
     setForms(Forms.map(form => {
       id === form.id ? form.selected = true : form.selected = false;
@@ -45449,7 +45467,7 @@ function DynamicForm(_ref) {
     }).every(key => key);
   };
   const getData = (name, input, value, commentValue, path, disabledPath) => {
-    var _input$meta, _input$meta2, _input$meta3, _input$meta4, _input$meta5, _input$meta6, _input$meta7, _input$meta8, _input$meta9, _input$meta10;
+    var _input$meta, _input$meta2, _input$meta3, _input$meta4, _input$meta5, _input$meta6, _input$meta7, _input$meta8, _input$meta9, _input$meta10, _input$meta11, _input$meta12;
     const props = {
       // placeholder: input.labelHint ? input.labelHint : getInputLabel(input, values, true),
       placeholder: input.labelHint,
@@ -45486,9 +45504,16 @@ function DynamicForm(_ref) {
       }
       value = fileList;
     }
+    // Handle default values for hidden fields
+    if ((input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.hidden) === true && (input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.defaultValue) !== undefined && !propHasValue(value)) {
+      value = input.meta.defaultValue;
+      if (typeof path === 'string') {
+        dot__default["default"].str(path, value, values);
+      }
+    }
     const config = {
       name,
-      call: input.call ? input.call : input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.call,
+      call: input.call ? input.call : input === null || input === void 0 || (_input$meta9 = input.meta) === null || _input$meta9 === void 0 ? void 0 : _input$meta9.call,
       automaticallyLink: input.automaticallyLink,
       props,
       formsValue: values,
@@ -45500,8 +45525,8 @@ function DynamicForm(_ref) {
       updateOptions: input.updateOptions || false,
       options: input.options,
       optionGroup: input.optionGroup,
-      optionsFilter: input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.optionsFilter,
-      filterCond: input === null || input === void 0 || (_input$meta9 = input.meta) === null || _input$meta9 === void 0 ? void 0 : _input$meta9.filterCond,
+      optionsFilter: input === null || input === void 0 || (_input$meta10 = input.meta) === null || _input$meta10 === void 0 ? void 0 : _input$meta10.optionsFilter,
+      filterCond: input === null || input === void 0 || (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.filterCond,
       disableOtherFields: input.disableOtherFields,
       updateOtherFields: input.updateOtherFields,
       repeatLabel: input.repeatLabel,
@@ -45511,7 +45536,7 @@ function DynamicForm(_ref) {
       restricted: input.restricted || false,
       totalMax: input.totalMax,
       country: input.country || undefined,
-      address: (input === null || input === void 0 || (_input$meta10 = input.meta) === null || _input$meta10 === void 0 ? void 0 : _input$meta10.address) || undefined,
+      address: (input === null || input === void 0 || (_input$meta12 = input.meta) === null || _input$meta12 === void 0 ? void 0 : _input$meta12.address) || undefined,
       stakeholderId: input.stakeholderId,
       preSelected,
       addressData,

package/dist/style/datastake/mapbox-gl.css

@@ -0,0 +1,330 @@
+/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
+
+/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
+.mapbox-gl-scope .mapboxgl-map {
+  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
+  overflow: hidden;
+  position: relative;
+  -webkit-tap-highlight-color: rgb(0 0 0/0);
+}
+
+.mapbox-gl-scope .mapboxgl-canvas {
+  left: 0;
+  position: absolute;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-canary {
+  background-color: salmon;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
+  cursor: grab;
+  -webkit-user-select: none;
+  user-select: none;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
+  cursor: pointer;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
+  cursor: grabbing;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
+  touch-action: pan-x pan-y;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: pinch-zoom;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: none;
+}
+
+/* Control positioning */
+.mapbox-gl-scope .mapboxgl-ctrl-bottom,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
+.mapbox-gl-scope .mapboxgl-ctrl-left,
+.mapbox-gl-scope .mapboxgl-ctrl-right,
+.mapbox-gl-scope .mapboxgl-ctrl-top,
+.mapbox-gl-scope .mapboxgl-ctrl-top-left,
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  pointer-events: none;
+  position: absolute;
+  z-index: 2;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left {
+  left: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top {
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  right: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-right {
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
+  bottom: 0;
+  right: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom {
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
+  bottom: 0;
+  left: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-left {
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl {
+  clear: both;
+  pointer-events: auto;
+  transform: translate(0);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0 0 10px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
+  float: right;
+  margin: 10px 10px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
+  float: right;
+  margin: 0 10px 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
+  float: left;
+  margin: 0 0 10px 10px;
+}
+
+/* Control group styling */
+.mapbox-gl-scope .mapboxgl-ctrl-group {
+  background: #fff;
+  border-radius: 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
+  box-shadow: 0 0 0 2px #0000001a;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button {
+  background-color: initial;
+  border: 0;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: block;
+  height: 29px;
+  outline: none;
+  overflow: hidden;
+  padding: 0;
+  width: 29px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
+  border-top: 1px solid #ddd;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
+  background-position: 50%;
+  background-repeat: no-repeat;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
+.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
+  box-shadow: 0 0 2px 2px #0096ff;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
+  cursor: not-allowed;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
+  opacity: .25;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
+  border-radius: 4px 4px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
+  border-radius: 0 0 4px 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
+  border-radius: inherit;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
+  background-color: #0000000d;
+}
+
+/* Marker styles */
+.mapbox-gl-scope .mapboxgl-marker {
+  position: absolute;
+  z-index: 1;
+}
+
+.mapbox-gl-scope .mapboxgl-marker svg {
+  display: block;
+}
+
+/* Popup styles */
+.mapbox-gl-scope .mapboxgl-popup {
+  position: absolute;
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
+  padding: 1px;
+  text-align: left;
+  border-radius: 12px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content {
+  margin: 13px 24px 13px 20px;
+  line-height: 1.3;
+  font-size: 13px;
+  min-height: 1px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content p {
+  margin: 17px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip-container {
+  width: 40px;
+  height: 20px;
+  position: absolute;
+  left: 50%;
+  margin-top: -1px;
+  margin-left: -20px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  width: 17px;
+  height: 17px;
+  padding: 1px;
+  margin: -10px auto 0;
+  pointer-events: auto;
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  background: white;
+  color: #333;
+  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border: none;
+  text-align: center;
+  width: 24px;
+  height: 24px;
+  font: 16px/24px Tahoma, Verdana, sans-serif;
+  color: #757575;
+  text-decoration: none;
+  background: transparent;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
+.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
+  color: #585858;
+}
+
+/* Attribution */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  background: #fff;
+  background: rgba(255, 255, 255, 0.8);
+  margin: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution,
+.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
+  padding: 0 5px;
+  color: #333;
+  line-height: 1.4;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
+  text-decoration: none;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
+  text-decoration: underline;
+}
+
+/* Hide attribution by default */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  display: none !important;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-logo {
+  display: none !important;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.485",
+	"version": "0.6.487",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Dashboard/ComponentWithFocus/index.jsx

@@ -71,28 +71,8 @@ export default function ComponentWithFocus({
 				}
 			}
 		},
-		[placeholderIsVisible, unFocus],  // Add unFocus to dependencies
+		[placeholderIsVisible],
 	);
-	
-	// Add wheel event handler
-	const handleWheel = useCallback(() => {
-		if (placeholderIsVisible) {
-			setPlaceholderIsVisible(false);
-		}
-	}, [placeholderIsVisible]);
-	
-	useEffect(() => {
-		document.addEventListener("mousemove", checkMouse);
-		return () => document.removeEventListener("mousemove", checkMouse); // Fix typo
-	}, [checkMouse]);
-	
-	useEffect(() => {
-		if (ref.current) {
-			const element = ref.current;
-			element.addEventListener("wheel", handleWheel);
-			return () => element.removeEventListener("wheel", handleWheel);
-		}
-	}, [handleWheel]);
 
 	useEffect(() => {
 		document.addEventListener("mousemove", checkMouse);

package/src/@daf/core/components/DynamicForm/helper.js

@@ -89,6 +89,13 @@ export const checkCondition = (condition, repeatValues, formsValue) => {
 };
 export function showHideInput(input, formsValue, repeatIndex, repeatValues, setValues, ref) {
 	if (input?.meta?.hidden === true) {
+		// Set default value for hidden fields
+		if (input?.meta?.defaultValue !== undefined && !propHasValue(formsValue[ref])) {
+			formsValue[ref] = input.meta.defaultValue;
+			if (setValues && typeof setValues === 'function') {
+				setValues({ ...formsValue });
+			}
+		}
 		return false;
 	}
 	if (input.showIf) {

package/src/@daf/core/components/DynamicForm/index.jsx

@@ -168,6 +168,34 @@ export default function DynamicForm({
     }
   }, [data]);
 
+    // Initialize default values for hidden fields
+    useEffect(() => {
+      if (Object.keys(form).length > 0) {
+        const updatedValues = { ...values };
+        let hasChanges = false;
+  
+        // Process all form fields to set default values for hidden fields
+        Object.keys(form).forEach(formKey => {
+          Object.keys(form[formKey]).forEach(fieldKey => {
+            const field = form[formKey][fieldKey];
+            if (field?.meta?.hidden === true && field?.meta?.defaultValue !== undefined) {
+              const fieldId = field.dataId || fieldKey;
+              if (!propHasValue(updatedValues[fieldId])) {
+                updatedValues[fieldId] = field.meta.defaultValue;
+                hasChanges = true;
+              }
+            }
+          });
+        });
+  
+        if (hasChanges) {
+          setValues(updatedValues);
+          // Also set the values in the Ant Design form
+          MainForm.setFieldsValue(updatedValues);
+        }
+      }
+    }, [form]);
+
   const setSelectedForm = (id) => {
     setForms(Forms.map(form => {
       (id === form.id)
@@ -267,6 +295,14 @@ export default function DynamicForm({
       }
       value = fileList;
     }
+    // Handle default values for hidden fields
+    if (input?.meta?.hidden === true && input?.meta?.defaultValue !== undefined && !propHasValue(value)) {
+      value = input.meta.defaultValue;
+      if (typeof path === 'string') {
+        dot.str(path, value, values);
+      }
+    }
+    
     const config = {
       name,
       call: input.call ? input.call : input?.meta?.call,