sag_components 2.0.0-beta335 → 2.0.0-beta337

package/dist/index.js

@@ -40727,6 +40727,7 @@ const RangePop = props => {
     params = [],
     paramType = "Week",
     onApply = () => {},
+    onCancel = () => {},
     buttonColor = "#066768",
     hoverColor = "#066768",
     initialValues = null
@@ -40797,6 +40798,7 @@ const RangePop = props => {
   const handleCancel = () => {
     reset();
     setSelectedRadio(radioOptions[0].toLowerCase());
+    onCancel();
   };
 
   // Validation rules
@@ -41162,6 +41164,7 @@ const TableHeader = ({
   activeFilters = [],
   activeSorts = [],
   expandable = false,
+  expandPosition = "left",
   onHeaderCheckboxClick = () => {},
   headerCheckboxStates = {},
   resetFiltersKey = 0,
@@ -41340,7 +41343,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;
   };
@@ -41623,30 +41626,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__default["default"].createElement(RangePop, {
         menuName: title,
@@ -41668,7 +41663,8 @@ const TableHeader = ({
             [key]: data
           }));
           setVisibleFilterPopWrapper(null);
-        }
+        },
+        onCancel: () => setVisibleFilterPopWrapper(null)
       });
     } else {
       // Check if this column has an active filter (not in default state)
@@ -41709,7 +41705,7 @@ const TableHeader = ({
       onReset: () => handleSortReset(key)
     });
   };
-  return /*#__PURE__*/React__default["default"].createElement(StyledTableHeader, null, /*#__PURE__*/React__default["default"].createElement("tr", null, expandable && /*#__PURE__*/React__default["default"].createElement(HeaderCell, {
+  return /*#__PURE__*/React__default["default"].createElement(StyledTableHeader, null, /*#__PURE__*/React__default["default"].createElement("tr", null, expandable && expandPosition !== "right" && /*#__PURE__*/React__default["default"].createElement(HeaderCell, {
     $fieldType: "expand",
     $minWidth: "16px",
     $maxWidth: "16px"
@@ -41760,7 +41756,11 @@ const TableHeader = ({
   }, /*#__PURE__*/React__default["default"].createElement(FilterIcon, {
     state: getFilterIconState(column.key),
     isActive: shouldShowActiveIcon(column.key)
-  }))))))), visibleSortPopWrapper && /*#__PURE__*/reactDom.createPortal(/*#__PURE__*/React__default["default"].createElement(PopWrapper, {
+  })))))), expandable && expandPosition === "right" && /*#__PURE__*/React__default["default"].createElement(HeaderCell, {
+    $fieldType: "expand",
+    $minWidth: "16px",
+    $maxWidth: "16px"
+  }, /*#__PURE__*/React__default["default"].createElement(ColumnContent, null, /*#__PURE__*/React__default["default"].createElement(ColumnLabel, null)))), visibleSortPopWrapper && /*#__PURE__*/reactDom.createPortal(/*#__PURE__*/React__default["default"].createElement(PopWrapper, {
     ref: popupRef,
     className: "pop-wrapper",
     top: popPosition.top,
@@ -43463,6 +43463,7 @@ const TableBody = /*#__PURE__*/React$1.forwardRef(({
   onCommentSave = () => {},
   commentTextLimit = 150,
   expandable = false,
+  expandPosition = "left",
   expandedRows = {},
   expandedContent = {},
   onExpandRow = () => {},
@@ -44298,7 +44299,7 @@ const TableBody = /*#__PURE__*/React$1.forwardRef(({
       onMouseEnter: () => !isEditMode && setHoveredRowIndex(rowIndex),
       onMouseLeave: () => !isEditMode && setHoveredRowIndex(null),
       onClick: () => handleRowClick(row, rowIndex)
-    }, expandable && expandedContent[rowIndex] !== undefined && expandedContent[rowIndex] !== null ? /*#__PURE__*/React__default["default"].createElement(TableCell, {
+    }, expandPosition !== "right" && (expandable && expandedContent[rowIndex] !== undefined && expandedContent[rowIndex] !== null ? /*#__PURE__*/React__default["default"].createElement(TableCell, {
       $fieldType: "expand",
       $minWidth: "16px",
       $maxWidth: "16px"
@@ -44317,7 +44318,7 @@ const TableBody = /*#__PURE__*/React$1.forwardRef(({
       $fieldType: "expand",
       $minWidth: "16px",
       $maxWidth: "16px"
-    }) : null, columns.map((column, columnIndex) => {
+    }) : null), columns.map((column, columnIndex) => {
       if (!column || !column.key) {
         console.warn(`Invalid column at index ${columnIndex}:`, column);
         return /*#__PURE__*/React__default["default"].createElement(TableCell, {
@@ -44433,7 +44434,26 @@ const TableBody = /*#__PURE__*/React$1.forwardRef(({
       }))))) : column.editable && column.renderEditableCell ? column.renderEditableCell(rowIndex, row, {
         markAllNotValidFields
       }) : renderCellContent(formattedValue, isTextBasedField, shouldShimmer));
-    })), expandable && expandedRows[rowIndex] && /*#__PURE__*/React__default["default"].createElement(ExpandedRow, {
+    }), expandPosition === "right" && (expandable && expandedContent[rowIndex] !== undefined && expandedContent[rowIndex] !== null ? /*#__PURE__*/React__default["default"].createElement(TableCell, {
+      $fieldType: "expand",
+      $minWidth: "16px",
+      $maxWidth: "16px"
+    }, /*#__PURE__*/React__default["default"].createElement(ExpandIcon, {
+      onClick: e => handleExpandClick(row, rowIndex, e),
+      $isExpanded: expandedRows[rowIndex] || false
+    }, expandedRows[rowIndex] ? /*#__PURE__*/React__default["default"].createElement(MenuItemOpenIcon, {
+      width: "12",
+      height: "12",
+      color: "#666"
+    }) : /*#__PURE__*/React__default["default"].createElement(ChervronRightIcon, {
+      width: "12",
+      height: "12",
+      fill: "#666"
+    }))) : expandable === true ? /*#__PURE__*/React__default["default"].createElement(TableCell, {
+      $fieldType: "expand",
+      $minWidth: "16px",
+      $maxWidth: "16px"
+    }) : null)), expandable && expandedRows[rowIndex] && /*#__PURE__*/React__default["default"].createElement(ExpandedRow, {
       $expandedBackgroundColor: expandedBackgroundColor
     }, /*#__PURE__*/React__default["default"].createElement(TableCell, {
       colSpan: columns.length + 1
@@ -48059,6 +48079,7 @@ const Table = props => {
     editRowIndex = -1,
     onCommentSave = () => {},
     expandable = false,
+    expandPosition = "left",
     expandedRows = {},
     expandedContent = {},
     onExpandRow = () => {},
@@ -48209,6 +48230,7 @@ const Table = props => {
     onFilter: onFilter,
     onSelectAll: onSelectAll,
     expandable: expandable,
+    expandPosition: expandPosition,
     onHeaderCheckboxClick: onHeaderCheckboxClick,
     headerCheckboxStates: headerCheckboxStates,
     resetFiltersKey: resetFiltersKey,
@@ -48236,6 +48258,7 @@ const Table = props => {
     changeFocusIndex: changeFocusIndex,
     onFocusChange: handleTableFocusChange,
     expandable: expandable,
+    expandPosition: expandPosition,
     expandedRows: expandedRows,
     expandedContent: expandedContent,
     onExpandRow: onExpandRow,