@geotab/zenith 1.20.0-beta.4 → 1.20.0

package/dist/dataGrid/withSortableColumns/columns/sortableColumnWrapper.js

@@ -36,7 +36,7 @@ const SortableHeaderCell = ({ columnName, isSortedBy, sortDirection, title, tool
             ? iconFilter3Asc_1.IconFilter3Asc
             : iconFilter3Desc_1.IconFilter3Desc;
     }, [sortDirection, isActive]);
-    const iconButton = ((0, jsx_runtime_1.jsx)(textIconButton_1.TextIconButton, { className: "zen-sortable-column-button__dir-icon zen-caption__post-icon", icon: icon, iconPosition: isMobile ? textIconButton_1.ButtonIconPosition.Start : textIconButton_1.ButtonIconPosition.End, type: buttonType_1.ButtonType.Light, title: iconTitle }));
+    const iconButton = ((0, jsx_runtime_1.jsx)(textIconButton_1.TextIconButton, { className: "zen-sortable-column-button__dir-icon zen-caption__post-icon", icon: icon, iconPosition: isMobile ? textIconButton_1.ButtonIconPosition.Start : textIconButton_1.ButtonIconPosition.End, type: buttonType_1.ButtonType.TertiaryBlack, title: iconTitle }));
     return ((0, jsx_runtime_1.jsx)("div", { className: (0, classNames_1.classNames)([
             "zen-sortable-column",
             isSortedBy ? `zen-sortable-column--active` : "",

package/dist/dateRange/dateRange.js

@@ -21,6 +21,7 @@ const useMobile_1 = require("../commonHelpers/hooks/useMobile");
 const mobileSheet_1 = require("../mobileSheet/mobileSheet");
 const footerButtons_1 = require("../footerButtons/footerButtons");
 const useDriveClassName_1 = require("../utils/theme/useDriveClassName");
+const areMapsEqual_1 = require("./utils/areMapsEqual");
 const parseLabel = (option, dateFormat, translate, toLacalFn) => {
     const localeFrom = toLacalFn(option.from);
     const localeTo = toLacalFn(option.to);
@@ -146,11 +147,16 @@ const DateRange = ({ className, classNamePopup, defaultValue, value, onChange, o
     const handleMobileBackClick = (0, react_1.useCallback)(() => {
         setShowMobileCalendar(false);
     }, []);
+    const optionsMapRef = (0, react_1.useRef)(optionsMap);
+    const isEqualMaps = (0, react_1.useMemo)(() => (0, areMapsEqual_1.areMapsEqual)(optionsMapRef.current, optionsMap), [optionsMap]);
+    if (!isEqualMaps) {
+        optionsMapRef.current = optionsMap;
+    }
     (0, react_1.useEffect)(() => {
         setCustomDate({ from: value === null || value === void 0 ? void 0 : value.from.toISOString(), to: value === null || value === void 0 ? void 0 : value.to.toISOString() });
-        const currentValue = (0, getRangeOption_1.getSelectedRangeFromValue)(optionsMap, value);
+        const currentValue = (0, getRangeOption_1.getSelectedRangeFromValue)(optionsMapRef.current, value);
         setPrevSelection(currentValue);
-    }, [optionsMap, value]);
+    }, [value, isEqualMaps]);
     const range = (0, react_1.useMemo)(() => ({ from: customDate.from, to: customDate.to }), [customDate.from, customDate.to]);
     const component = (0, react_1.useMemo)(() => (0, jsx_runtime_1.jsx)(dateRangeInner_1.DateRangeInner, { id: id || componentId, options: options, onOptionSelect: handleDateRangeSelection, onCalendarSelect: hasCustomOption ? (val) => {
             setCustomDate({ from: lockStartDate || val.from, to: lockEndDate || (lockStartDate ? val.to || val.from : val.to) });

package/dist/dateRange/utils/areMapsEqual.d.ts

@@ -0,0 +1,2 @@
+import { IDateRangeOption } from "../dateRangeUtils";
+export declare function areMapsEqual(map1: Map<string, IDateRangeOption>, map2: Map<string, IDateRangeOption>): boolean | undefined;

package/dist/dateRange/utils/areMapsEqual.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.areMapsEqual = void 0;
+function areMapsEqual(map1, map2) {
+    if (!(map1 instanceof Map) || !(map2 instanceof Map)) {
+        return undefined;
+    }
+    if (map1.size !== map2.size) {
+        return false;
+    }
+    for (const [key1, value1] of map1.entries()) {
+        if (!map2.has(key1)) {
+            return false;
+        }
+        const value2 = map2.get(key1);
+        if (!value2) {
+            return false;
+        }
+        if (value1.label !== value2.label) {
+            return false;
+        }
+        const range1 = value1.getRange();
+        const range2 = value2.getRange();
+        if (range1.from.getTime() !== range2.from.getTime() || range1.to.getTime() !== range2.to.getTime()) {
+            return false;
+        }
+        if ((value1.hasSecondaryLabel !== undefined && value2.hasSecondaryLabel !== undefined) && value1.hasSecondaryLabel !== value2.hasSecondaryLabel ||
+            (value1.hasSecondaryLabel === undefined && value2.hasSecondaryLabel !== undefined) ||
+            (value1.hasSecondaryLabel !== undefined && value2.hasSecondaryLabel === undefined)) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.areMapsEqual = areMapsEqual;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geotab/zenith",
-  "version": "1.20.0-beta.4",
+  "version": "1.20.0",
   "description": "Zenith components library on React",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -93,6 +93,6 @@
     ]
   },
   "publishConfig": {
-   "access": "public"
- }
+    "access": "public"
+  }
 }