argous 1.2.219 → 1.2.220

package/dist/components/ArgousComplexTable/ArgousComplexTable.js

@@ -201,9 +201,9 @@ var ArgousComplexTable = react_1.forwardRef(function (_a, ref) {
     }, [ctrlPgn.recordCount]);
     var buscaMetodo = react_1.useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
         var res;
-        var _a, _b, _c, _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     if (!method || !allowMethodRequest)
                         return [2 /*return*/];
@@ -215,10 +215,10 @@ var ArgousComplexTable = react_1.forwardRef(function (_a, ref) {
                                 indOrdem: orderBy >= 0 ? orderBy : undefined
                             } }, methodPrms), handleMethodError)];
                 case 1:
-                    res = _g.sent();
+                    res = _c.sent();
                     onMethodResponse && onMethodResponse(res);
                     if (res.status) {
-                        setCtrlPgn(__assign(__assign({}, res.ctrlPgn), { recordCount: ((((_a = res.ctrlPgn) === null || _a === void 0 ? void 0 : _a.recordCount) || ((_b = res[methodResultList]) === null || _b === void 0 ? void 0 : _b.length)) < ((_c = res.ctrlPgn) === null || _c === void 0 ? void 0 : _c.qtRegs)) ? (_d = res[methodResultList]) === null || _d === void 0 ? void 0 : _d.length : ((_e = res.ctrlPgn) === null || _e === void 0 ? void 0 : _e.qtPaginas) * ((_f = res.ctrlPgn) === null || _f === void 0 ? void 0 : _f.qtRegs) }));
+                        setCtrlPgn(__assign(__assign({}, res.ctrlPgn), { recordCount: (((_a = res.ctrlPgn) === null || _a === void 0 ? void 0 : _a.qtPaginas) * ((_b = res.ctrlPgn) === null || _b === void 0 ? void 0 : _b.qtRegs)) }));
                         setLista(res[methodResultList] || []);
                     }
                     dispatch({ type: 'setLoading', value: false });
@@ -279,7 +279,6 @@ var ArgousComplexTable = react_1.forwardRef(function (_a, ref) {
         setSelected: function (s) { return dispatch({ type: 'setSelected', value: lodash_1.isFunction(s) ? s(selected, dadosMostrados) : s }); },
         setLoading: function (value) { return dispatch({ type: 'setLoading', value: value }); }
     }); });
-    //________________EXTERNAL_CTRL_PGN____________________________________________________________________________
     var _2 = react_1.useState(true), bounced = _2[0], setBounced = _2[1];
     var getFullCtrlPgn = function (internal) {
         var ctrl = internal ? ctrlPgn : externalCtrlPgn;
@@ -302,17 +301,16 @@ var ArgousComplexTable = react_1.forwardRef(function (_a, ref) {
             var fullCtrlPgn = getFullCtrlPgn(true);
             var fullExternalCtrlPgn = getFullCtrlPgn();
             if (!lodash_1.isEqual(fullExternalCtrlPgn, fullCtrlPgn)) {
-                setCtrlPgn(__assign(__assign({}, fullExternalCtrlPgn), { recordCount: (((externalCtrlPgn === null || externalCtrlPgn === void 0 ? void 0 : externalCtrlPgn.recordCount) || (dados === null || dados === void 0 ? void 0 : dados.length)) < (externalCtrlPgn === null || externalCtrlPgn === void 0 ? void 0 : externalCtrlPgn.qtRegs)) ? dados === null || dados === void 0 ? void 0 : dados.length : (externalCtrlPgn === null || externalCtrlPgn === void 0 ? void 0 : externalCtrlPgn.qtPaginas) * (externalCtrlPgn === null || externalCtrlPgn === void 0 ? void 0 : externalCtrlPgn.qtRegs) }));
+                setCtrlPgn(__assign(__assign({}, fullExternalCtrlPgn), { recordCount: ((externalCtrlPgn === null || externalCtrlPgn === void 0 ? void 0 : externalCtrlPgn.qtPaginas) * (externalCtrlPgn === null || externalCtrlPgn === void 0 ? void 0 : externalCtrlPgn.qtRegs)) }));
                 setBounced(true);
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [externalCtrlPgn]);
-    //_____________________________________________________________________________________________________________
-    return (react_1.default.createElement(exports.TableContext.Provider, { value: __assign(__assign({}, memoState), { dadosMostrados: dadosMostrados, lista: lista, indexToSelect: indexToSelect, method: method }) },
+    return (react_1.default.createElement(exports.TableContext.Provider, { value: __assign(__assign({}, memoState), { dadosMostrados: dadosMostrados, lista: lista, indexToSelect: indexToSelect, method: method, externalCtrlPgn: externalCtrlPgn }) },
         react_1.default.createElement(core_1.ClickAwayListener, { onClickAway: onClickAway },
             react_1.default.createElement(core_1.TableContainer, __assign({ component: core_1.Paper, variant: 'outlined', style: style }, containerProps, { className: clsx_1.default(classes.root, className) }),
-                react_1.default.createElement(ToolbarComponent, __assign({ numSelected: selected.length, disableFilter: disableFilter || !!method }, __assign({ actions: actions, title: title, selected: selected, filter: filter, filterLabel: filterLabel, lista: lista, indexToSelect: indexToSelect, fixedToolbar: fixedToolbar }, toolbarProps))),
+                react_1.default.createElement(ToolbarComponent, __assign({ numSelected: selected.length, disableFilter: disableFilter || !!method || !!externalCtrlPgn }, __assign({ actions: actions, title: title, selected: selected, filter: filter, filterLabel: filterLabel, lista: lista, indexToSelect: indexToSelect, fixedToolbar: fixedToolbar }, toolbarProps))),
                 react_1.default.createElement(core_1.Table, __assign({}, __assign(__assign({}, tableProps), { size: size })),
                     react_1.default.createElement(HeadComponent, __assign({ size: (method || externalCtrlPgn) ? ctrlPgn.recordCount : dadosNaoCortados.length, numSelected: selected.length, rowCount: (rowsPerPage > ((method || externalCtrlPgn) ? ctrlPgn.recordCount : dadosNaoCortados.length)) ? ((method || externalCtrlPgn) ? ctrlPgn.recordCount : dadosNaoCortados.length) : (rowsPerPage || dadosNaoCortados.length) }, { head: head, order: order, orderBy: orderBy, enableCheck: enableCheck, headerColumnStyles: headerColumnStyles, disableSorting: disableSorting, ordCols: ordCols, method: method, cortaDados: cortaDados, disableCheckIf: disableCheckIf, line: line, enableDrag: enableDrag })),
                     react_1.default.createElement(BodyComponent, __assign({}, {

package/dist/components/ArgousComplexTableHead/ArgousComplexTableHead.js

@@ -51,16 +51,16 @@ var ArgousComplexTableHead = react_1.memo(function (_a) {
     var _b;
     var numSelected = _a.numSelected, rowCount = _a.rowCount, head = _a.head, enableCheck = _a.enableCheck, disableCheckIf = _a.disableCheckIf, line = _a.line, size = _a.size, headerColumnStyles = _a.headerColumnStyles, disableSorting = _a.disableSorting, ordCols = _a.ordCols, cortaDados = _a.cortaDados, enableDrag = _a.enableDrag;
     var classes = useStyles();
-    var _c = react_1.useContext(ArgousComplexTable_1.TableContext), selected = _c.selected, order = _c.order, orderBy = _c.orderBy, dispatch = _c.dispatch, lista = _c.lista, indexToSelect = _c.indexToSelect, method = _c.method;
+    var _c = react_1.useContext(ArgousComplexTable_1.TableContext), selected = _c.selected, order = _c.order, orderBy = _c.orderBy, dispatch = _c.dispatch, lista = _c.lista, indexToSelect = _c.indexToSelect, method = _c.method, externalCtrlPgn = _c.externalCtrlPgn;
     var handleRequestSort = function (property) {
         var isAsc = orderBy === property && order === 'asc';
         dispatch({ type: 'setOrder', value: isAsc ? 'desc' : 'asc' });
         dispatch({ type: 'setOrderBy', value: property });
     };
-    var length = react_1.useMemo(function () { return disableCheckIf ? lista.reduce(function (acc, linha, i) { return !disableCheckIf(linha, line(linha), i) ? acc + 1 : acc; }, 0) : size; }, [disableCheckIf, lista, size]);
+    var length = react_1.useMemo(function () { return disableCheckIf ? lista.reduce(function (acc, linha, i) { return !disableCheckIf(linha, line(linha), i) ? acc + 1 : acc; }, 0) : size; }, [disableCheckIf, lista, size, line]);
     var handleSelectAllClick = function (event) {
         if (event.target.checked) {
-            if (!method && selected.length === 0)
+            if (!method && !externalCtrlPgn && (selected.length === 0))
                 dispatch({ type: 'setSelected', value: cortaDados(lista).filter(function (linha, i) { return disableCheckIf ? !disableCheckIf(linha, line(linha), i) : true; }).map(function (n) { return n[indexToSelect]; }) });
             else if (selected.length < length)
                 dispatch({ type: 'setSelected', value: lista.filter(function (linha, i) { return disableCheckIf ? !disableCheckIf(linha, line(linha), i) : true; }).map(function (n) { return n[indexToSelect]; }) });
@@ -72,12 +72,12 @@ var ArgousComplexTableHead = react_1.memo(function (_a) {
     };
     return (react_1.default.createElement(core_1.TableHead, null,
         react_1.default.createElement(core_1.TableRow, { className: clsx_1.default((_b = {},
-                _b[classes.highlight] = (numSelected === rowCount || numSelected === length) && (rowCount && length),
-                _b[classes.lighthighlight] = numSelected > 0 && numSelected < rowCount,
+                _b[classes.highlight] = (((numSelected === rowCount) || (numSelected === length) || (numSelected === (lista === null || lista === void 0 ? void 0 : lista.length))) && (rowCount && length)),
+                _b[classes.lighthighlight] = ((numSelected > 0) && ((method || externalCtrlPgn) ? (numSelected < (lista === null || lista === void 0 ? void 0 : lista.length)) : (numSelected < rowCount))),
                 _b)) },
             enableDrag && react_1.default.createElement(core_1.TableCell, { padding: 'checkbox' }),
             enableCheck && react_1.default.createElement(core_1.TableCell, { padding: 'checkbox' },
-                react_1.default.createElement(core_1.Checkbox, { disabled: !length, indeterminate: method ? (numSelected > 0 && numSelected < rowCount) : (numSelected > 0 && numSelected < length), checked: method ? (rowCount > 0 && numSelected === rowCount) : (rowCount > 0 && length && numSelected === length), onChange: handleSelectAllClick })),
+                react_1.default.createElement(core_1.Checkbox, { disabled: !length, indeterminate: (method || externalCtrlPgn) ? ((numSelected > 0) && (numSelected < (lista === null || lista === void 0 ? void 0 : lista.length))) : ((numSelected > 0) && (numSelected < length)), checked: (method || externalCtrlPgn) ? ((rowCount > 0) && ((numSelected === rowCount) || (numSelected === (lista === null || lista === void 0 ? void 0 : lista.length)))) : ((rowCount > 0) && length && (numSelected === length)), onChange: handleSelectAllClick })),
             lodash_1.isArray(head) && head.map(function (item, i) { return (react_1.default.createElement(core_1.TableCell, { key: i, style: headerColumnStyles ? headerColumnStyles[i] : undefined }, (disableSorting[i] || (ordCols && !ordCols[i])) ?
                 item
                 :

package/lib/components/ArgousComplexTable/ArgousComplexTable.js

@@ -225,7 +225,7 @@ const ArgousComplexTable = forwardRef(({
     }, handleMethodError);
     onMethodResponse && onMethodResponse(res);      
     if (res.status) {
-      setCtrlPgn({ ...res.ctrlPgn, recordCount: ((res.ctrlPgn?.recordCount || res[methodResultList]?.length) < res.ctrlPgn?.qtRegs) ? res[methodResultList]?.length : res.ctrlPgn?.qtPaginas * res.ctrlPgn?.qtRegs });
+      setCtrlPgn({ ...res.ctrlPgn, recordCount: (res.ctrlPgn?.qtPaginas * res.ctrlPgn?.qtRegs) });
       setLista(res[methodResultList] || []);
     }
     dispatch({ type: 'setLoading', value: false });
@@ -288,9 +288,6 @@ const ArgousComplexTable = forwardRef(({
     setLoading: value => dispatch({ type: 'setLoading', value })
   }));
 
-
-  //________________EXTERNAL_CTRL_PGN____________________________________________________________________________
-
   const [bounced, setBounced] = useState(true);
 
   const getFullCtrlPgn = (internal) => {
@@ -302,7 +299,7 @@ const ArgousComplexTable = forwardRef(({
       ...ctrl
     };
   };
-  
+
   useEffect(() => {
     if (!method && setExternalCtrlPgn) {
       const fullCtrlPgn = {
@@ -323,23 +320,21 @@ const ArgousComplexTable = forwardRef(({
       const fullCtrlPgn = getFullCtrlPgn(true);
       const fullExternalCtrlPgn = getFullCtrlPgn();
       if (!isEqual(fullExternalCtrlPgn, fullCtrlPgn)) {
-        setCtrlPgn({ ...fullExternalCtrlPgn, recordCount: ((externalCtrlPgn?.recordCount || dados?.length) < externalCtrlPgn?.qtRegs) ? dados?.length : externalCtrlPgn?.qtPaginas * externalCtrlPgn?.qtRegs });
+        setCtrlPgn({ ...fullExternalCtrlPgn, recordCount: (externalCtrlPgn?.qtPaginas * externalCtrlPgn?.qtRegs) });
         setBounced(true);
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [externalCtrlPgn]);
-  
-  //_____________________________________________________________________________________________________________
-  
+
 
   return (
-    <TableContext.Provider value={{ ...memoState, dadosMostrados, lista, indexToSelect, method }}>
+    <TableContext.Provider value={{ ...memoState, dadosMostrados, lista, indexToSelect, method, externalCtrlPgn }}>
       <ClickAwayListener onClickAway={onClickAway}>
         <TableContainer component={Paper} variant='outlined' style={style} {...containerProps} className={clsx(classes.root, className)}>
           <ToolbarComponent 
             numSelected={selected.length} 
-            disableFilter={disableFilter || !!method}
+            disableFilter={disableFilter || !!method || !!externalCtrlPgn} 
             {...{ actions, title, selected, filter, filterLabel, lista, indexToSelect, fixedToolbar, ...toolbarProps }} />
           <Table {...{ ...tableProps, size }}>
             <HeadComponent

package/lib/components/ArgousComplexTableHead/ArgousComplexTableHead.js

@@ -40,7 +40,7 @@ const ArgousComplexTableHead = memo(({
   enableDrag
 }) => {
   const classes = useStyles();
-  const { selected, order, orderBy, dispatch, lista, indexToSelect, method } = useContext(TableContext);
+  const { selected, order, orderBy, dispatch, lista, indexToSelect, method, externalCtrlPgn } = useContext(TableContext);
 
   const handleRequestSort = property => {
     const isAsc = orderBy === property && order === 'asc';
@@ -48,11 +48,11 @@ const ArgousComplexTableHead = memo(({
     dispatch({ type: 'setOrderBy', value: property });
   };
 
-  const length = useMemo(() => disableCheckIf ? lista.reduce((acc, linha, i) => !disableCheckIf(linha, line(linha), i) ? acc + 1 : acc, 0) : size, [disableCheckIf, lista, size]);
+  const length = useMemo(() => disableCheckIf ? lista.reduce((acc, linha, i) => !disableCheckIf(linha, line(linha), i) ? acc + 1 : acc, 0) : size, [disableCheckIf, lista, size, line]);
 
   const handleSelectAllClick = event => {
     if (event.target.checked) {
-      if (!method && selected.length === 0) dispatch({ type: 'setSelected', value: cortaDados(lista).filter((linha, i) => disableCheckIf ? !disableCheckIf(linha, line(linha), i) : true).map((n) => n[indexToSelect]) });
+      if (!method && !externalCtrlPgn && (selected.length === 0)) dispatch({ type: 'setSelected', value: cortaDados(lista).filter((linha, i) => disableCheckIf ? !disableCheckIf(linha, line(linha), i) : true).map((n) => n[indexToSelect]) });
       else if (selected.length < length) dispatch({ type: 'setSelected', value: lista.filter((linha, i) => disableCheckIf ? !disableCheckIf(linha, line(linha), i) : true).map((n) => n[indexToSelect]) });
       else dispatch({ type: 'setSelected', value: [] });
     } else dispatch({ type: 'setSelected', value: [] });
@@ -61,15 +61,15 @@ const ArgousComplexTableHead = memo(({
   return (
     <TableHead>
       <TableRow className={clsx({ 
-        [classes.highlight]: (numSelected === rowCount || numSelected === length) && (rowCount && length), 
-        [classes.lighthighlight]: numSelected > 0 && numSelected < rowCount 
+        [classes.highlight]: (((numSelected === rowCount) || (numSelected === length) || (numSelected === lista?.length)) && (rowCount && length)), 
+        [classes.lighthighlight]: ((numSelected > 0) && ((method || externalCtrlPgn) ? (numSelected < lista?.length) : (numSelected < rowCount))) 
       })}>
         {enableDrag && <TableCell padding='checkbox'/>}
         {enableCheck && <TableCell padding='checkbox'>
           <Checkbox
             disabled={!length}
-            indeterminate={method ? (numSelected > 0 && numSelected < rowCount) : (numSelected > 0 && numSelected < length)}
-            checked={method ? (rowCount > 0 && numSelected === rowCount) : (rowCount > 0 && length && numSelected === length)}
+            indeterminate={(method || externalCtrlPgn) ? ((numSelected > 0) && (numSelected < lista?.length)) : ((numSelected > 0) && (numSelected < length))}
+            checked={(method || externalCtrlPgn) ? ((rowCount > 0) && ((numSelected === rowCount) || (numSelected === lista?.length))) : ((rowCount > 0) && length && (numSelected === length))}
             onChange={handleSelectAllClick}
           />
         </TableCell>}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argous",
-  "version": "1.2.219",
+  "version": "1.2.220",
   "description": "Argous.",
   "main": "lib/index.js",
   "author": "Carlos Schneider",