@equinor/apollo-components 3.1.7 → 3.1.8-beta.0

package/dist/index.d.ts

@@ -4,9 +4,10 @@ import { ReactNode, ReactElement, HTMLProps, MutableRefObject, Dispatch, SetStat
 import * as styled_components from 'styled-components';
 import * as _equinor_eds_core_react from '@equinor/eds-core-react';
 import { CellProps, TypographyProps as TypographyProps$1 } from '@equinor/eds-core-react';
-import { Cell, Header, CellContext, Table, Row, SortingState, OnChangeFn, ColumnDef, RowSelectionState, ExpandedState, VisibilityState, HeaderContext } from '@tanstack/react-table';
+import { Cell, Header, Table, CellContext, Row, SortingState, OnChangeFn, ColumnDef, RowSelectionState, ExpandedState, VisibilityState, HeaderContext } from '@tanstack/react-table';
 import { ColumnDef as ColumnDef$1 } from '@tanstack/table-core';
 import { SetRequired } from 'type-fest';
+import { TableOptions } from '@tanstack/table-core/build/lib/types';
 
 interface AppShellProps {
     children?: ReactNode;
@@ -36,8 +37,9 @@ declare function DynamicCell<T>({ cell, highlight, getStickyCellColor }: TableCe
 
 interface HeaderCellProps<TData, TValue> {
     header: Header<TData, TValue>;
+    table: Table<TData>;
 }
-declare const HeaderCell: <TData, TValue>({ header }: HeaderCellProps<TData, TValue>) => JSX.Element;
+declare const HeaderCell: <TData, TValue>({ header, table }: HeaderCellProps<TData, TValue>) => JSX.Element;
 
 declare type HierarchyCellOptions = {
     getRowDepth?: () => number;
@@ -131,6 +133,7 @@ interface DataTableProps<T> {
     virtual?: boolean;
     getRowId?: (originalRow: T, index: number, parent: Row<T> | undefined) => string;
     getSubRows?: (originalRow: T) => T[] | undefined;
+    columnResizing?: boolean | TableOptions<T>['columnResizeMode'];
     rowSelection?: Partial<ControlledState<RowSelectionState>> & {
         mode?: RowSelectionMode;
         selectColumn?: 'default' | ((options?: Record<string, any>) => ColumnDef<T, any>);

package/dist/index.js

@@ -2580,16 +2580,40 @@ function DynamicCell({ cell, highlight, getStickyCellColor }) {
 // src/cells/HeaderCell.tsx
 var import_eds_core_react5 = require("@equinor/eds-core-react");
 var import_eds_icons3 = require("@equinor/eds-icons");
+var import_eds_tokens3 = require("@equinor/eds-tokens");
 var import_react_table2 = require("@tanstack/react-table");
 var import_styled_components6 = __toESM(require("styled-components"));
 var import_jsx_runtime5 = require("react/jsx-runtime");
-var HeaderDiv = import_styled_components6.default.div`
-  display: flex;
-  align-items: center;
-  gap: 0.25rem;
-  z-index: 5;
+var resizeCellStyle = import_styled_components6.css`
+  .resizer {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    width: 4px;
+    opacity: 0;
+    background: #aaa;
+    cursor: col-resize;
+    user-select: none;
+    touch-action: none;
+  }
+
+  .resizer.isResizing {
+    background: ${import_eds_tokens3.tokens.colors.interactive.focus.hex};
+    opacity: 1;
+  }
+
+  &:hover .resizer {
+    opacity: 1;
+  }
+`;
+var StickyCell2 = (0, import_styled_components6.default)(StickyHeaderCell)`
+  ${resizeCellStyle}
 `;
-var HeaderCell = ({ header }) => {
+var Cell2 = (0, import_styled_components6.default)(import_eds_core_react5.Table.Cell)`
+  ${resizeCellStyle}
+`;
+var HeaderCell = ({ header, table }) => {
   var _a;
   const style = {
     width: header.column.getSize(),
@@ -2602,21 +2626,29 @@ var HeaderCell = ({ header }) => {
     colSpan: header.colSpan
   };
   if ((_a = header.column.columnDef.meta) == null ? void 0 : _a.sticky) {
-    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(StickyHeaderCell, {
+    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(StickyCell2, {
       ...cellProps,
       children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(HeaderContent, {
-        header
+        header,
+        table
       })
     }, header.id);
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_eds_core_react5.Table.Cell, {
+  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Cell2, {
     ...cellProps,
     children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(HeaderContent, {
-      header
+      header,
+      table
     })
   }, header.id);
 };
-function HeaderContent({ header }) {
+var HeaderDiv = import_styled_components6.default.div`
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+  z-index: 5;
+`;
+function HeaderContent({ header, table }) {
   if (header.isPlaceholder)
     return null;
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(HeaderDiv, {
@@ -2632,7 +2664,16 @@ function HeaderContent({ header }) {
         none: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_eds_core_react5.Icon, {
           data: import_eds_icons3.arrow_drop_down
         })
-      }[header.column.getIsSorted()] ?? null
+      }[header.column.getIsSorted()] ?? null,
+      table.options.enableColumnResizing && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", {
+        onMouseDown: header.getResizeHandler(),
+        onTouchStart: header.getResizeHandler(),
+        onClick: (e) => e.stopPropagation(),
+        className: `resizer ${header.column.getIsResizing() ? "isResizing" : ""}`,
+        style: {
+          transform: table.options.columnResizeMode === "onEnd" && header.column.getIsResizing() ? `translateX(${table.getState().columnSizingInfo.deltaOffset}px)` : ""
+        }
+      })
     ]
   });
 }
@@ -2650,12 +2691,12 @@ function getSort({ column }) {
 }
 
 // src/cells/HierarchyCell.tsx
-var import_eds_tokens4 = require("@equinor/eds-tokens");
+var import_eds_tokens5 = require("@equinor/eds-tokens");
 var import_styled_components8 = __toESM(require("styled-components"));
 
 // src/cells/TypographyCustom.tsx
 var import_eds_core_react6 = require("@equinor/eds-core-react");
-var import_eds_tokens3 = require("@equinor/eds-tokens");
+var import_eds_tokens4 = require("@equinor/eds-tokens");
 var import_styled_components7 = __toESM(require("styled-components"));
 var import_jsx_runtime6 = require("react/jsx-runtime");
 var truncateStyle = {
@@ -2689,7 +2730,7 @@ var TypographyCustom = (props) => {
   });
 };
 var HoverCapture = import_styled_components7.default.div`
-  height: ${import_eds_tokens3.tokens.typography.table.cell_text.lineHeight};
+  height: ${import_eds_tokens4.tokens.typography.table.cell_text.lineHeight};
   background-color: inherit;
 
   position: relative;
@@ -2724,11 +2765,11 @@ var CellWrapper = (0, import_styled_components8.default)(TypographyCustom)`
   ${({ depth, expanded }) => expanded && depth === 0 && "font-weight: bold;"}
 
   ${({ depth }) => depth > 0 && import_styled_components8.css`
-      border-left: 3px solid ${import_eds_tokens4.tokens.colors.infographic.primary__moss_green_34.hex};
+      border-left: 3px solid ${import_eds_tokens5.tokens.colors.infographic.primary__moss_green_34.hex};
       gap: 0.5rem;
       .--divider {
         width: ${depth * 32}px;
-        background-color: ${import_eds_tokens4.tokens.colors.infographic.primary__moss_green_34.hex};
+        background-color: ${import_eds_tokens5.tokens.colors.infographic.primary__moss_green_34.hex};
         height: 3px;
         border-radius: 0 5px 5px 0;
       }
@@ -2984,7 +3025,8 @@ function TableHeader({ table, sticky }) {
     sticky,
     children: table.getHeaderGroups().map((headerGroup) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_eds_core_react10.Table.Row, {
       children: headerGroup.headers.map((header) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(HeaderCell, {
-        header
+        header,
+        table
       }, header.id))
     }, headerGroup.id))
   });
@@ -3367,7 +3409,7 @@ var import_jsx_runtime19 = require("react/jsx-runtime");
 function canUseContainStrict(height) {
   if (!height)
     return false;
-  const heightIsANumber = !isNaN(parseFloat(height));
+  const heightIsANumber = !isNaN(Number(height)) && !isNaN(parseFloat(height));
   if (heightIsANumber)
     return false;
   const heightIsPercentage = height.endsWith("%");
@@ -3446,6 +3488,8 @@ function DataTable(props) {
         });
       }
     },
+    enableColumnResizing: Boolean(props.columnResizing),
+    columnResizeMode: typeof props.columnResizing === "boolean" ? "onChange" : props.columnResizing,
     enableSorting: sorting == null ? void 0 : sorting.enableSorting,
     manualSorting: sorting == null ? void 0 : sorting.manualSorting,
     enableExpanding: Boolean(props.expansion),

package/dist/index.mjs

@@ -2534,18 +2534,42 @@ function DynamicCell({ cell, highlight, getStickyCellColor }) {
 }
 
 // src/cells/HeaderCell.tsx
-import { Icon as Icon3, Table as Table3 } from "@equinor/eds-core-react";
+import { Icon as Icon3, Table as EdsTable } from "@equinor/eds-core-react";
 import { arrow_drop_down, arrow_drop_up } from "@equinor/eds-icons";
+import { tokens as tokens3 } from "@equinor/eds-tokens";
 import { flexRender as flexRender2 } from "@tanstack/react-table";
-import styled6 from "styled-components";
+import styled6, { css as css3 } from "styled-components";
 import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
-var HeaderDiv = styled6.div`
-  display: flex;
-  align-items: center;
-  gap: 0.25rem;
-  z-index: 5;
+var resizeCellStyle = css3`
+  .resizer {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    width: 4px;
+    opacity: 0;
+    background: #aaa;
+    cursor: col-resize;
+    user-select: none;
+    touch-action: none;
+  }
+
+  .resizer.isResizing {
+    background: ${tokens3.colors.interactive.focus.hex};
+    opacity: 1;
+  }
+
+  &:hover .resizer {
+    opacity: 1;
+  }
+`;
+var StickyCell2 = styled6(StickyHeaderCell)`
+  ${resizeCellStyle}
 `;
-var HeaderCell = ({ header }) => {
+var Cell2 = styled6(EdsTable.Cell)`
+  ${resizeCellStyle}
+`;
+var HeaderCell = ({ header, table }) => {
   var _a;
   const style = {
     width: header.column.getSize(),
@@ -2558,21 +2582,29 @@ var HeaderCell = ({ header }) => {
     colSpan: header.colSpan
   };
   if ((_a = header.column.columnDef.meta) == null ? void 0 : _a.sticky) {
-    return /* @__PURE__ */ jsx5(StickyHeaderCell, {
+    return /* @__PURE__ */ jsx5(StickyCell2, {
       ...cellProps,
       children: /* @__PURE__ */ jsx5(HeaderContent, {
-        header
+        header,
+        table
       })
     }, header.id);
   }
-  return /* @__PURE__ */ jsx5(Table3.Cell, {
+  return /* @__PURE__ */ jsx5(Cell2, {
     ...cellProps,
     children: /* @__PURE__ */ jsx5(HeaderContent, {
-      header
+      header,
+      table
     })
   }, header.id);
 };
-function HeaderContent({ header }) {
+var HeaderDiv = styled6.div`
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+  z-index: 5;
+`;
+function HeaderContent({ header, table }) {
   if (header.isPlaceholder)
     return null;
   return /* @__PURE__ */ jsxs3(HeaderDiv, {
@@ -2588,7 +2620,16 @@ function HeaderContent({ header }) {
         none: /* @__PURE__ */ jsx5(Icon3, {
           data: arrow_drop_down
         })
-      }[header.column.getIsSorted()] ?? null
+      }[header.column.getIsSorted()] ?? null,
+      table.options.enableColumnResizing && /* @__PURE__ */ jsx5("div", {
+        onMouseDown: header.getResizeHandler(),
+        onTouchStart: header.getResizeHandler(),
+        onClick: (e) => e.stopPropagation(),
+        className: `resizer ${header.column.getIsResizing() ? "isResizing" : ""}`,
+        style: {
+          transform: table.options.columnResizeMode === "onEnd" && header.column.getIsResizing() ? `translateX(${table.getState().columnSizingInfo.deltaOffset}px)` : ""
+        }
+      })
     ]
   });
 }
@@ -2606,14 +2647,14 @@ function getSort({ column }) {
 }
 
 // src/cells/HierarchyCell.tsx
-import { tokens as tokens4 } from "@equinor/eds-tokens";
-import styled8, { css as css3 } from "styled-components";
+import { tokens as tokens5 } from "@equinor/eds-tokens";
+import styled8, { css as css4 } from "styled-components";
 
 // src/cells/TypographyCustom.tsx
 import {
   Typography as EdsTypography
 } from "@equinor/eds-core-react";
-import { tokens as tokens3 } from "@equinor/eds-tokens";
+import { tokens as tokens4 } from "@equinor/eds-tokens";
 import styled7 from "styled-components";
 import { jsx as jsx6 } from "react/jsx-runtime";
 var truncateStyle = {
@@ -2647,7 +2688,7 @@ var TypographyCustom = (props) => {
   });
 };
 var HoverCapture = styled7.div`
-  height: ${tokens3.typography.table.cell_text.lineHeight};
+  height: ${tokens4.typography.table.cell_text.lineHeight};
   background-color: inherit;
 
   position: relative;
@@ -2681,12 +2722,12 @@ var CellWrapper = styled8(TypographyCustom)`
 
   ${({ depth, expanded }) => expanded && depth === 0 && "font-weight: bold;"}
 
-  ${({ depth }) => depth > 0 && css3`
-      border-left: 3px solid ${tokens4.colors.infographic.primary__moss_green_34.hex};
+  ${({ depth }) => depth > 0 && css4`
+      border-left: 3px solid ${tokens5.colors.infographic.primary__moss_green_34.hex};
       gap: 0.5rem;
       .--divider {
         width: ${depth * 32}px;
-        background-color: ${tokens4.colors.infographic.primary__moss_green_34.hex};
+        background-color: ${tokens5.colors.infographic.primary__moss_green_34.hex};
         height: 3px;
         border-radius: 0 5px 5px 0;
       }
@@ -2942,7 +2983,8 @@ function TableHeader({ table, sticky }) {
     sticky,
     children: table.getHeaderGroups().map((headerGroup) => /* @__PURE__ */ jsx11(Table4.Row, {
       children: headerGroup.headers.map((header) => /* @__PURE__ */ jsx11(HeaderCell, {
-        header
+        header,
+        table
       }, header.id))
     }, headerGroup.id))
   });
@@ -2960,7 +3002,7 @@ import { useEffect as useEffect3, useRef as useRef3, useState as useState6 } fro
 import styled16 from "styled-components";
 
 // src/DataTable/components/BasicTable.tsx
-import { Table as EdsTable } from "@equinor/eds-core-react";
+import { Table as EdsTable2 } from "@equinor/eds-core-react";
 
 // src/DataTable/components/PlaceholderRow.tsx
 import { DotProgress, Table as Table5, Typography as Typography2 } from "@equinor/eds-core-react";
@@ -3055,9 +3097,9 @@ function BasicTable({
   tableCaption
 }) {
   const tableRows = table.getRowModel().rows;
-  return /* @__PURE__ */ jsxs8(EdsTable, {
+  return /* @__PURE__ */ jsxs8(EdsTable2, {
     children: [
-      /* @__PURE__ */ jsx14(EdsTable.Caption, {
+      /* @__PURE__ */ jsx14(EdsTable2.Caption, {
         hidden: true,
         children: tableCaption
       }),
@@ -3331,7 +3373,7 @@ import { jsx as jsx19, jsxs as jsxs11 } from "react/jsx-runtime";
 function canUseContainStrict(height) {
   if (!height)
     return false;
-  const heightIsANumber = !isNaN(parseFloat(height));
+  const heightIsANumber = !isNaN(Number(height)) && !isNaN(parseFloat(height));
   if (heightIsANumber)
     return false;
   const heightIsPercentage = height.endsWith("%");
@@ -3410,6 +3452,8 @@ function DataTable(props) {
         });
       }
     },
+    enableColumnResizing: Boolean(props.columnResizing),
+    columnResizeMode: typeof props.columnResizing === "boolean" ? "onChange" : props.columnResizing,
     enableSorting: sorting == null ? void 0 : sorting.enableSorting,
     manualSorting: sorting == null ? void 0 : sorting.manualSorting,
     enableExpanding: Boolean(props.expansion),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/apollo-components",
-  "version": "3.1.7",
+  "version": "3.1.8-beta.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",