sag_components 2.0.0-beta336 → 2.0.0-beta338

package/dist/index.esm.js

@@ -10792,24 +10792,23 @@ const QuarterPopupPicker = ({
 };
 
 /* eslint-disable import/no-extraneous-dependencies */
-const QuarterPicker = _ref => {
-  let {
-    availableQuarters,
-    // ["Q1-2024"]
-    label,
-    onChange,
-    borderRadius,
-    required,
-    width,
-    height,
-    placeholder,
-    disabled,
-    borderColor,
-    borderColorFocus,
-    textColor,
-    selectedValue,
-    startYear
-  } = _ref;
+const QuarterPicker = ({
+  availableQuarters,
+  // ["Q1-2024"]
+  label,
+  onChange,
+  borderRadius,
+  required,
+  width,
+  height,
+  placeholder,
+  disabled,
+  borderColor,
+  borderColorFocus,
+  textColor,
+  selectedValue,
+  startYear
+}) => {
   const [isFocused, setIsFocused] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
   const [value, setValue] = useState('');
@@ -11251,23 +11250,22 @@ const MonthPopupPicker = ({
 };
 
 /* eslint-disable import/no-extraneous-dependencies */
-const MonthPicker = _ref => {
-  let {
-    availableMonths,
-    label,
-    onChange,
-    borderRadius,
-    required,
-    width,
-    height,
-    placeholder,
-    disabled,
-    borderColor,
-    borderColorFocus,
-    textColor,
-    selectedValue,
-    startYear
-  } = _ref;
+const MonthPicker = ({
+  availableMonths,
+  label,
+  onChange,
+  borderRadius,
+  required,
+  width,
+  height,
+  placeholder,
+  disabled,
+  borderColor,
+  borderColorFocus,
+  textColor,
+  selectedValue,
+  startYear
+}) => {
   const [isFocused, setIsFocused] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
   const [value, setValue] = useState('');
@@ -11590,7 +11588,9 @@ const FilterPanel = props => {
   };
   const getSelectedValueYear = item => {
     let selectedValueYear = [];
-    if (item?.defaultValueYears?.value) {
+    if (item?.selectedValue?.length > 0) {
+      selectedValueYear = item.selectedValue;
+    } else if (item?.defaultValueYears?.value) {
       selectedValueYear = [item?.defaultValueYears];
     }
     return selectedValueYear;
@@ -40717,6 +40717,7 @@ const RangePop = props => {
     params = [],
     paramType = "Week",
     onApply = () => {},
+    onCancel = () => {},
     buttonColor = "#066768",
     hoverColor = "#066768",
     initialValues = null
@@ -40787,6 +40788,7 @@ const RangePop = props => {
   const handleCancel = () => {
     reset();
     setSelectedRadio(radioOptions[0].toLowerCase());
+    onCancel();
   };
 
   // Validation rules
@@ -41331,7 +41333,7 @@ const TableHeader = ({
       return true;
     }
     if (filterData.selectedRadio) {
-      return filterData.selectedRadio === 'all weeks';
+      return filterData.selectedRadio !== 'custom range';
     }
     return filterData.isSelectAll && filterData.excluded?.length === 0 && filterData.included?.length === 0;
   };
@@ -41614,30 +41616,22 @@ const TableHeader = ({
     } else if (rangeFilter) {
       const currentFilterState = filterState[key];
 
-      // Determine if this is a price column
-      const isPriceColumn = key.toLowerCase().includes('price') || key.toLowerCase().includes('cost') || key.toLowerCase().includes('amount');
+      // Determine symbol: use column prop if provided, otherwise auto-detect
+      const isPriceColumn = key.toLowerCase().includes('price') || key.toLowerCase().includes('cost');
+      const symbol = column.rangeFilterSymbol !== undefined ? column.rangeFilterSymbol : isPriceColumn ? '$' : '';
+      const inputType = symbol !== undefined && symbol !== 'week' ? 'price' : 'week';
 
       // Configure RangePop based on column type
-      const rangeConfig = isPriceColumn ? {
-        paramType: '$',
-        params: [{
-          label: 'From $',
-          type: 'price'
-        }, {
-          label: 'To $',
-          type: 'price'
-        }],
-        radioOptions: ['All Prices', 'Custom Range']
-      } : {
-        paramType: 'Week',
+      const rangeConfig = {
+        paramType: symbol || '#',
         params: [{
-          label: 'From',
-          type: 'week'
+          label: symbol ? `From ${symbol}` : 'From',
+          type: inputType
         }, {
-          label: 'To',
-          type: 'week'
+          label: symbol ? `To ${symbol}` : 'To',
+          type: inputType
         }],
-        radioOptions: ['All Weeks', 'Custom Range']
+        radioOptions: [`All ${title}`, 'Custom Range']
       };
       return /*#__PURE__*/React$1.createElement(RangePop, {
         menuName: title,
@@ -41659,7 +41653,8 @@ const TableHeader = ({
             [key]: data
           }));
           setVisibleFilterPopWrapper(null);
-        }
+        },
+        onCancel: () => setVisibleFilterPopWrapper(null)
       });
     } else {
       // Check if this column has an active filter (not in default state)