@visns-studio/visns-components 6.0.1 → 6.0.2

package/package.json

@@ -91,7 +91,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "6.0.1",
+    "version": "6.0.2",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/DataGrid.jsx

@@ -2403,23 +2403,68 @@ const DataGrid = forwardRef(
                     }
                 }, '');
 
-                const iconData = config.icons.find(
+                let iconData = config.icons.find(
                     (icon) => icon.value === fieldValue
                 );
 
+                // An icon marked fallback: true matches any non-empty value
+                // that no explicit entry matched (e.g. "any country other
+                // than Australia" → international icon).
+                if (
+                    !iconData &&
+                    fieldValue !== '' &&
+                    fieldValue != null &&
+                    fieldValue !== 0
+                ) {
+                    iconData = config.icons.find(
+                        (icon) => icon.fallback === true
+                    );
+                }
+
                 if (
                     iconData &&
                     (iconData.src || iconData.icon) &&
                     iconData.alt &&
                     iconData.tooltipContent
                 ) {
+                    // tooltipFrom: path into the row data whose value (when
+                    // present) replaces the static tooltip — e.g. show the
+                    // actual country name on the international icon. Optional
+                    // tooltipPrefix is prepended to the resolved value.
+                    let tooltipContent = iconData.tooltipContent;
+                    if (Array.isArray(iconData.tooltipFrom)) {
+                        const resolved = iconData.tooltipFrom.reduce(
+                            (acc, id) => (acc == null ? acc : acc[id]),
+                            data
+                        );
+                        if (resolved != null && resolved !== '') {
+                            tooltipContent = `${
+                                iconData.tooltipPrefix || ''
+                            }${resolved}`;
+                        }
+                    }
+
                     addIcon(
                         iconData.src ? iconData.src : null,
                         iconData.icon ? iconData.icon : null,
                         iconData.alt,
-                        iconData.tooltipContent,
+                        tooltipContent,
                         `coding-${config.id[0]}-${configKey}`
                     );
+                } else {
+                    // Empty placeholder slot so every config group occupies a
+                    // fixed position — icons align vertically across rows.
+                    icons.push(
+                        <div
+                            key={`coding-slot-${config.id[0]}-${configKey}`}
+                            style={{
+                                display: 'inline-flex',
+                                width: '28px',
+                                height: '28px',
+                                margin: '0 1px',
+                            }}
+                        />
+                    );
                 }
             });