qbs-react-grid 1.2.1 → 1.2.2

package/src/qbsTable/QbsTable.tsx

@@ -18,12 +18,13 @@ import ToolBar from './Toolbar';
 import ColumToggle from './utilities/ColumShowHide';
 import debounce from './utilities/debounce';
 import { deepEqual } from './utilities/deepEqual';
+import NoData from './utilities/empty';
 import { SettingsIcon } from './utilities/icons';
 
 // import 'qbs-react-table/dist/css/qbs-react-grid.css';
 
 import '../../dist/css/qbs-react-grid.css';
-import NoData from './utilities/empty';
+import CardComponent from './utilities/CardComponent';
 
 const CHECKBOX_LINE_HEIGHT = '36px';
 const COLUMN_WIDTH = 250;
@@ -81,7 +82,9 @@ const QbsTable: React.FC<QbsTableProps> = ({
   renderEmpty,
   autoHeight,
   emptySubTitle,
-  emptyTitle
+  emptyTitle,
+  tableView = true,
+  enableTableToggle = false
 }) => {
   const [loading, setLoading] = useState(false);
   const [columns, setColumns] = useState(propColumn);
@@ -89,6 +92,8 @@ const QbsTable: React.FC<QbsTableProps> = ({
   const dataTheme = useMemo(() => localStorage.getItem('theme') ?? theme, [theme]);
   const [isOpen, setIsOpen] = useState(false);
   const prevColumns = useRef<any | null>();
+  const [tableViewToggle, setTableViewToggle] = useState(tableView);
+
   const tableBodyRef = useRef<HTMLDivElement>(null);
   const handleSortColumn = useCallback(
     (sortColumn: any, sortType: any) => {
@@ -115,7 +120,11 @@ const QbsTable: React.FC<QbsTableProps> = ({
   const handleCheckAll = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const keys = event.target.checked ? data.map(item => item.id) : [];
-      let updatedKeys = [...keys];
+      //  let updatedKeys = [...keys];
+      //  if (checkedKeys) {
+      //    updatedKeys = [...checkedKeys, ...updatedKeys];
+      //  } TODO => previous bug fix removed this section
+      const updatedKeys = [...keys];
       setCheckedKeys(updatedKeys);
       handleChecked(updatedKeys);
     },
@@ -126,7 +135,7 @@ const QbsTable: React.FC<QbsTableProps> = ({
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const value = event.target.value;
       if (value !== undefined) {
-        let updatedKeys = event.target.checked
+        const updatedKeys = event.target.checked
           ? [...checkedKeys, value]
           : checkedKeys.filter(key => key !== value);
         setCheckedKeys(updatedKeys);
@@ -222,7 +231,10 @@ const QbsTable: React.FC<QbsTableProps> = ({
     onSelect: handleClear,
     handleColumnToggle: handleColumnToggle,
     dataLength: data?.length,
-    searchPlaceholder: searchPlaceholder
+    searchPlaceholder: searchPlaceholder,
+    setTableViewToggle: setTableViewToggle,
+    tableViewToggle: tableViewToggle,
+    enableTableToggle : enableTableToggle
   };
   const themeToggle = useMemo(() => document.getElementById('themeToggle') as HTMLInputElement, []);
 
@@ -259,7 +271,7 @@ const QbsTable: React.FC<QbsTableProps> = ({
       const keyValue = dataRowKey as string;
       const key = rowData[keyValue];
 
-      let nextExpandedRowKeys = new Set(expandedRowKeys);
+      const nextExpandedRowKeys = new Set(expandedRowKeys);
 
       if (nextExpandedRowKeys.has(key)) {
         nextExpandedRowKeys.delete(key);
@@ -436,129 +448,154 @@ const QbsTable: React.FC<QbsTableProps> = ({
     <div className={`qbs-table ${classes.tableContainerClass}`} data-theme={dataTheme}>
       {toolbar && <ToolBar {...toolbarProps} />}
       <div className="qbs-table-border-wrap">
-        <Table
-          height={autoHeight ? undefined : height}
-          key={tableKey}
-          tableKey={tableKey}
-          data={data}
-          tableBodyRef={tableBodyRef}
-          dataTheme={dataTheme}
-          wordWrap={wordWrap}
-          autoHeight={autoHeight}
-          sortColumn={sortColumn}
-          style={{ position: 'relative' }}
-          sortType={sortType}
-          onSortColumn={handleSortColumn}
-          onRowClick={onRowClick}
-          tableBodyHeight={tableBodyHeight}
-          cellBordered={cellBordered}
-          bordered={bordered}
-          renderEmpty={(info: React.ReactNode) =>
-            renderEmpty ? (
-              renderEmpty(info)
-            ) : (
-              <NoData title={emptyTitle ?? 'No Data Found'} subtitle={emptySubTitle} />
-            )
-          }
-          columns={columns}
-          minHeight={minHeight}
-          headerHeight={headerHeight}
-          rowExpandedHeight={rowExpandedHeight}
-          loading={isLoading ?? loading}
-          showHeader
-          defaultChecked
-          expandedRowKeys={expandedRowKeys}
-          onExpandChange={onExpandChange}
-          rowKey={dataRowKey ?? 'id'}
-          defaultExpandAllRows={defaultExpandAllRows}
-          shouldUpdateScroll={shouldUpdateScroll}
-          renderRowExpanded={rowData => {
-            return handleRowExpanded?.(rowData);
-          }}
-        >
-          {rowExpand && (
-            <Column width={70} align="center" fixed="left">
-              <HeaderCell
-                verticalAlign={findGrouped() ? 'middle' : undefined}
-                className={` ${classes.headerlClass}`}
-                renderSortIcon={renderSortIcon}
-              >
-                #
-              </HeaderCell>
-              <ExpandCell
-                dataKey={dataRowKey}
-                expandedRowKeys={expandedRowKeys}
-                onChange={handleExpanded}
-              />
-            </Column>
-          )}
-          {selection && (
-            <Column width={50} align="center" fixed="left">
-              <HeaderCell
-                style={{ padding: 0 }}
-                verticalAlign={findGrouped() ? 'middle' : undefined}
-                dataTheme={dataTheme}
-                renderSortIcon={renderSortIcon}
-                className={`qbs-checkbox-border-none ${classes.headerlClass}`}
-              >
-                <div
-                  style={{ lineHeight: CHECKBOX_LINE_HEIGHT }}
-                  className={`qbs-table-checkbox ${classes.selectionCell}`}
+        {tableViewToggle ? (
+          <Table
+            height={autoHeight ? undefined : height}
+            key={tableKey}
+            tableKey={tableKey}
+            data={data}
+            tableBodyRef={tableBodyRef}
+            dataTheme={dataTheme}
+            wordWrap={wordWrap}
+            autoHeight={autoHeight}
+            sortColumn={sortColumn}
+            style={{ position: 'relative' }}
+            sortType={sortType}
+            onSortColumn={handleSortColumn}
+            onRowClick={onRowClick}
+            tableBodyHeight={tableBodyHeight}
+            cellBordered={cellBordered}
+            bordered={bordered}
+            renderEmpty={(info: React.ReactNode) =>
+              renderEmpty ? (
+                renderEmpty(info)
+              ) : (
+                <NoData title={emptyTitle ?? 'No Data Found'} subtitle={emptySubTitle} />
+              )
+            }
+            columns={columns}
+            minHeight={minHeight}
+            headerHeight={headerHeight}
+            rowExpandedHeight={rowExpandedHeight}
+            loading={isLoading ?? loading}
+            showHeader
+            defaultChecked
+            expandedRowKeys={expandedRowKeys}
+            onExpandChange={onExpandChange}
+            rowKey={dataRowKey ?? 'id'}
+            defaultExpandAllRows={defaultExpandAllRows}
+            shouldUpdateScroll={shouldUpdateScroll}
+            renderRowExpanded={rowData => {
+              return handleRowExpanded?.(rowData);
+            }}
+          >
+            {rowExpand && (
+              <Column width={70} align="center" fixed="left">
+                <HeaderCell
+                  verticalAlign={findGrouped() ? 'middle' : undefined}
+                  className={` ${classes.headerlClass}`}
+                  renderSortIcon={renderSortIcon}
                 >
-                  <input
-                    type="checkbox"
-                    onChange={handleCheckAll}
-                    id={`checkbox-all`}
-                    className={`qbs-table-checkbox-input ${classes.tableCheckBoxClass}`}
-                    checked={data?.length > 0 && data.every(item => checkedKeys?.includes(item.id))}
-                  />
-                  <label htmlFor={`checkbox-all`}>
-                    <svg
-                      width="8"
-                      height="6"
-                      viewBox="0 0 8 6"
-                      fill="none"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 3.21739L2.89883 6L8 1.06994L6.89494 0L2.89883 3.86768L1.09728 2.14745L0 3.21739Z"
-                        fill="white"
-                      />
-                    </svg>
-                  </label>
-                </div>
-              </HeaderCell>
-              <CheckCell
-                dataKey="id"
-                checkedKeys={checkedKeys}
-                className={`${classes.tableCheckBoxClass}`}
-                onChange={handleCheck}
-                dataTheme={dataTheme}
-              />
-            </Column>
-          )}
-          {customRowStatus && Object.keys(customRowStatus)?.length > 0 && (
-            <Column width={50} align="center" fixed="left">
-              <HeaderCell
-                verticalAlign={findGrouped() ? 'middle' : undefined}
-                className={` ${classes.headerlClass}`}
-                renderSortIcon={renderSortIcon}
-              >
-                {' '}
-              </HeaderCell>
-              <CustomRowStatus
-                getIcon={customRowStatus.getIcon}
-                dataKey={customRowStatus.field}
-                rowClick={customRowStatus.onClick}
-                path={customRowStatus.getPath}
-                link={customRowStatus.link}
-                getToolTip={customRowStatus.getToolTip}
-              />
-            </Column>
-          )}
-          {columnsRendered}
-          {!actionProps ||
-            (actionProps?.length === 0 && columnToggle && (
+                  #
+                </HeaderCell>
+                <ExpandCell
+                  dataKey={dataRowKey}
+                  expandedRowKeys={expandedRowKeys}
+                  onChange={handleExpanded}
+                />
+              </Column>
+            )}
+            {selection && (
+              <Column width={50} align="center" fixed="left">
+                <HeaderCell
+                  style={{ padding: 0 }}
+                  verticalAlign={findGrouped() ? 'middle' : undefined}
+                  dataTheme={dataTheme}
+                  renderSortIcon={renderSortIcon}
+                  className={`qbs-checkbox-border-none ${classes.headerlClass}`}
+                >
+                  <div
+                    style={{ lineHeight: CHECKBOX_LINE_HEIGHT }}
+                    className={`qbs-table-checkbox ${classes.selectionCell}`}
+                  >
+                    <input
+                      type="checkbox"
+                      onChange={handleCheckAll}
+                      id={'checkbox-all'}
+                      className={`qbs-table-checkbox-input ${classes.tableCheckBoxClass}`}
+                      checked={
+                        data?.length > 0 && data.every(item => checkedKeys?.includes(item.id))
+                      }
+                    />
+                    <label htmlFor={'checkbox-all'}>
+                      <svg
+                        width="8"
+                        height="6"
+                        viewBox="0 0 8 6"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M0 3.21739L2.89883 6L8 1.06994L6.89494 0L2.89883 3.86768L1.09728 2.14745L0 3.21739Z"
+                          fill="white"
+                        />
+                      </svg>
+                    </label>
+                  </div>
+                </HeaderCell>
+                <CheckCell
+                  dataKey="id"
+                  checkedKeys={checkedKeys}
+                  className={`${classes.tableCheckBoxClass}`}
+                  onChange={handleCheck}
+                  dataTheme={dataTheme}
+                />
+              </Column>
+            )}
+            {customRowStatus && Object.keys(customRowStatus)?.length > 0 && (
+              <Column width={50} align="center" fixed="left">
+                <HeaderCell
+                  verticalAlign={findGrouped() ? 'middle' : undefined}
+                  className={` ${classes.headerlClass}`}
+                  renderSortIcon={renderSortIcon}
+                >
+                  {' '}
+                </HeaderCell>
+                <CustomRowStatus
+                  getIcon={customRowStatus.getIcon}
+                  dataKey={customRowStatus.field}
+                  rowClick={customRowStatus.onClick}
+                  path={customRowStatus.getPath}
+                  link={customRowStatus.link}
+                  getToolTip={customRowStatus.getToolTip}
+                />
+              </Column>
+            )}
+            {columnsRendered}
+            {!actionProps ||
+              (actionProps?.length === 0 && columnToggle && (
+                <Column width={40} fixed="right">
+                  <HeaderCell
+                    verticalAlign={findGrouped() ? 'middle' : undefined}
+                    className={` ${classes.headerlClass}`}
+                    dataTheme={dataTheme}
+                    renderSortIcon={renderSortIcon}
+                  >
+                    <ColumToggle
+                      columns={columns}
+                      onToggle={handleToggle}
+                      onReorder={onReorder}
+                      isOpen={isOpen}
+                      tableHeight={height}
+                      setIsOpen={setIsOpen}
+                      handleResetColumns={handleResetColumns}
+                      handleColumnToggle={handleColumnToggle}
+                    />
+                  </HeaderCell>
+                  <Cell />
+                </Column>
+              ))}
+            {actionProps && actionProps?.length > 0 && (
               <Column width={40} fixed="right">
                 <HeaderCell
                   verticalAlign={findGrouped() ? 'middle' : undefined}
@@ -566,54 +603,45 @@ const QbsTable: React.FC<QbsTableProps> = ({
                   dataTheme={dataTheme}
                   renderSortIcon={renderSortIcon}
                 >
-                  <ColumToggle
-                    columns={columns}
-                    onToggle={handleToggle}
-                    onReorder={onReorder}
-                    isOpen={isOpen}
-                    tableHeight={height}
-                    setIsOpen={setIsOpen}
-                    handleResetColumns={handleResetColumns}
-                    handleColumnToggle={handleColumnToggle}
-                  />
+                  {!columnToggle ? (
+                    <SettingsIcon />
+                  ) : (
+                    <ColumToggle
+                      columns={columns}
+                      onToggle={handleToggle}
+                      tableHeight={height}
+                      onReorder={onReorder}
+                      isOpen={isOpen}
+                      setIsOpen={setIsOpen}
+                      handleResetColumns={handleResetColumns}
+                      handleColumnToggle={handleColumnToggle}
+                    />
+                  )}
                 </HeaderCell>
-                <Cell />
+                <ActionCell
+                  tableBodyRef={tableBodyRef}
+                  actionProps={actionProps}
+                  className={`${classes.cellClass} ${classes.actionCellClass}`}
+                  handleMenuActions={handleMenuActions}
+                  dataTheme={dataTheme}
+                />
               </Column>
+            )}
+          </Table>
+        ) : (
+          <div className=" p-2">
+            {data.map((items: any) => (
+              <div className="flex flex-col gap-3 p-2" key={items?.id}>
+                <CardComponent
+                  data={items}
+                  columns={columns}
+                  tableBodyRef={tableBodyRef}
+                  actionProps={actionProps}
+                />
+              </div>
             ))}
-          {actionProps && actionProps?.length > 0 && (
-            <Column width={40} fixed="right">
-              <HeaderCell
-                verticalAlign={findGrouped() ? 'middle' : undefined}
-                className={` ${classes.headerlClass}`}
-                dataTheme={dataTheme}
-                renderSortIcon={renderSortIcon}
-              >
-                {!columnToggle ? (
-                  <SettingsIcon />
-                ) : (
-                  <ColumToggle
-                    columns={columns}
-                    onToggle={handleToggle}
-                    tableHeight={height}
-                    onReorder={onReorder}
-                    isOpen={isOpen}
-                    setIsOpen={setIsOpen}
-                    handleResetColumns={handleResetColumns}
-                    handleColumnToggle={handleColumnToggle}
-                  />
-                )}
-              </HeaderCell>
-              <ActionCell
-                tableBodyRef={tableBodyRef}
-                actionProps={actionProps}
-                className={`${classes.cellClass} ${classes.actionCellClass}`}
-                handleMenuActions={handleMenuActions}
-                dataTheme={dataTheme}
-              />
-            </Column>
-          )}
-        </Table>
-
+          </div>
+        )}
         <div>
           {pagination && data?.length > 0 && <Pagination paginationProps={paginationProps} />}
         </div>