@secondstaxorg/sscomp 2.1.15 → 2.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -27173,17 +27173,32 @@ const TablePrimary = (props) => {
27173
27173
  function sortByColumn(column) {
27174
27174
  let sorted;
27175
27175
 
27176
+ //check if the column is a date column
27177
+ const colIsDate = thead.some(item => (item.dataKey === column && item.isDate));
27178
+
27176
27179
  if (sortedCol !== column){
27177
- sorted = tbodyOri.sort((a,b) => a[column].localeCompare(b[column]));
27180
+ if (colIsDate){
27181
+ sorted = tbodyOri.sort((a,b) => new Date(a[column]).getTime().toString().localeCompare(new Date(b[column]).getTime().toString()));
27182
+ }else {
27183
+ sorted = tbodyOri.sort((a,b) => a[column].localeCompare(b[column]));
27184
+ }
27178
27185
  setSortDirection('asc');
27179
27186
  setSortedCol(column);
27180
27187
  }else {
27181
27188
  if (sortDirection === 'desc') {
27182
- sorted = tbodyOri.sort((a,b) => a[column].localeCompare(b[column]));
27189
+ if (colIsDate){
27190
+ sorted = tbodyOri.sort((a,b) => new Date(a[column]).getTime().toString().localeCompare(new Date(b[column]).getTime().toString()));
27191
+ }else {
27192
+ sorted = tbodyOri.sort((a,b) => a[column].localeCompare(b[column]));
27193
+ }
27183
27194
  setSortDirection('asc');
27184
27195
  setSortedCol(column);
27185
27196
  }else {
27186
- sorted = tbodyOri.sort((a,b) => b[column].localeCompare(a[column]));
27197
+ if (colIsDate){
27198
+ sorted = tbodyOri.sort((a,b) => new Date(b[column]).getTime().toString().localeCompare(new Date(a[column]).getTime().toString()));
27199
+ }else {
27200
+ sorted = tbodyOri.sort((a,b) => b[column].localeCompare(a[column]));
27201
+ }
27187
27202
  setSortDirection('desc');
27188
27203
  setSortedCol(column);
27189
27204
  }
@@ -27199,33 +27214,33 @@ const TablePrimary = (props) => {
27199
27214
 
27200
27215
  return (
27201
27216
  React$1.createElement(React$1.Fragment, null
27202
- , React$1.createElement(TableContainer$1, {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 94}}
27203
- , React$1.createElement(Table, {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 95}}
27204
- , React$1.createElement('thead', {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 96}}
27205
- , React$1.createElement('tr', { className: "rounded-row paragraph2Medium" , __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 97}}
27217
+ , React$1.createElement(TableContainer$1, {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 109}}
27218
+ , React$1.createElement(Table, {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 110}}
27219
+ , React$1.createElement('thead', {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 111}}
27220
+ , React$1.createElement('tr', { className: "rounded-row paragraph2Medium" , __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 112}}
27206
27221
  , thead.map((item,index) => (
27207
27222
  React$1.createElement('th', { key: index, onClick: ()=>{
27208
27223
  sortByColumn(item.dataKey);
27209
- }, __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 99}}, React$1.createElement('span', { className: "thead-label", __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 101}}, item.label, " " , sortedCol === item.dataKey && React$1.createElement(CaretDown, { direction: sortDirection === 'asc' ? 'up' : 'down', __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 101}})))
27224
+ }, __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 114}}, React$1.createElement('span', { className: "thead-label", __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 116}}, item.label, " " , sortedCol === item.dataKey && React$1.createElement(CaretDown, { direction: sortDirection === 'asc' ? 'up' : 'down', __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 116}})))
27210
27225
  ))
27211
27226
  )
27212
27227
  )
27213
- , React$1.createElement('tbody', { className: "rounded-row paragraph2Regular" , __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 105}}
27228
+ , React$1.createElement('tbody', { className: "rounded-row paragraph2Regular" , __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 120}}
27214
27229
  , children
27215
27230
  , !children && dataToShow && dataToShow.map((item,index) => (
27216
27231
  React$1.createElement('tr', { key: index, className: clickedRow && 'clickable', onClick: ()=>{
27217
27232
  if (clickedRow) {
27218
27233
  clickedRow(item);
27219
- }}, __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 108}}
27234
+ }}, __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 123}}
27220
27235
  , thead.map((cellItem,index) => (
27221
- React$1.createElement('td', { key: index, className: (index == thead.length - 1 && clickedRow) ? 'with-arrow' : '', __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 113}}
27222
- , React$1.createElement('span', {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 114}}
27236
+ React$1.createElement('td', { key: index, className: (index == thead.length - 1 && clickedRow) ? 'with-arrow' : '', __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 128}}
27237
+ , React$1.createElement('span', {__self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 129}}
27223
27238
  , _nullishCoalesce$2(_optionalChain$c([cellItem, 'access', _ => _.component, 'optionalCall', _2 => _2(item)]), () => ( item[cellItem.dataKey]))
27224
27239
  /*{item[cellItem.dataKey]}*/
27225
27240
  )
27226
27241
  , (index == thead.length - 1 && clickedRow) &&
27227
- React$1.createElement('svg', { width: "16", height: "16", viewBox: "0 0 16 16" , fill: "none", xmlns: "http://www.w3.org/2000/svg", __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 119}}
27228
- , React$1.createElement('path', { d: "M10.3592 7.52685L6.58584 3.76019C6.52387 3.6977 6.45013 3.64811 6.36889 3.61426C6.28765 3.58041 6.20052 3.56299 6.11251 3.56299C6.0245 3.56299 5.93736 3.58041 5.85612 3.61426C5.77488 3.64811 5.70115 3.6977 5.63917 3.76019C5.51501 3.8851 5.44531 4.05406 5.44531 4.23019C5.44531 4.40631 5.51501 4.57528 5.63917 4.70019L8.93917 8.03352L5.63917 11.3335C5.51501 11.4584 5.44531 11.6274 5.44531 11.8035C5.44531 11.9796 5.51501 12.1486 5.63917 12.2735C5.70092 12.3365 5.77455 12.3866 5.8558 12.421C5.93705 12.4553 6.0243 12.4732 6.11251 12.4735C6.20071 12.4732 6.28797 12.4553 6.36922 12.421C6.45047 12.3866 6.5241 12.3365 6.58584 12.2735L10.3592 8.50685C10.4268 8.44443 10.4808 8.36866 10.5178 8.28432C10.5547 8.19999 10.5738 8.10892 10.5738 8.01685C10.5738 7.92479 10.5547 7.83372 10.5178 7.74938C10.4808 7.66505 10.4268 7.58928 10.3592 7.52685Z" , fill: "#A4BBDD", __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 120}})
27242
+ React$1.createElement('svg', { width: "16", height: "16", viewBox: "0 0 16 16" , fill: "none", xmlns: "http://www.w3.org/2000/svg", __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 134}}
27243
+ , React$1.createElement('path', { d: "M10.3592 7.52685L6.58584 3.76019C6.52387 3.6977 6.45013 3.64811 6.36889 3.61426C6.28765 3.58041 6.20052 3.56299 6.11251 3.56299C6.0245 3.56299 5.93736 3.58041 5.85612 3.61426C5.77488 3.64811 5.70115 3.6977 5.63917 3.76019C5.51501 3.8851 5.44531 4.05406 5.44531 4.23019C5.44531 4.40631 5.51501 4.57528 5.63917 4.70019L8.93917 8.03352L5.63917 11.3335C5.51501 11.4584 5.44531 11.6274 5.44531 11.8035C5.44531 11.9796 5.51501 12.1486 5.63917 12.2735C5.70092 12.3365 5.77455 12.3866 5.8558 12.421C5.93705 12.4553 6.0243 12.4732 6.11251 12.4735C6.20071 12.4732 6.28797 12.4553 6.36922 12.421C6.45047 12.3866 6.5241 12.3365 6.58584 12.2735L10.3592 8.50685C10.4268 8.44443 10.4808 8.36866 10.5178 8.28432C10.5547 8.19999 10.5738 8.10892 10.5738 8.01685C10.5738 7.92479 10.5547 7.83372 10.5178 7.74938C10.4808 7.66505 10.4268 7.58928 10.3592 7.52685Z" , fill: "#A4BBDD", __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 135}})
27229
27244
  )
27230
27245
 
27231
27246
  )
@@ -27239,7 +27254,7 @@ const TablePrimary = (props) => {
27239
27254
  React$1.createElement(Pagination, { itemsPerPage: itemsPerPage, items: tbodyOri, paginatedItems: (arr)=>{
27240
27255
  setTbodyItems(arr);
27241
27256
  paginatedItems(arr);
27242
- }, __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 131}})
27257
+ }, __self: undefined, __source: {fileName: _jsxFileName$p, lineNumber: 146}})
27243
27258
 
27244
27259
  )
27245
27260
  )