armtek-uikit-react 1.0.114 → 1.0.116

package/assets/Table.scss

@@ -17,12 +17,23 @@
 .tableCellInner{
   padding: calc($size-step * 2 ) $size-step;
 }
+.tableCellInner_size_small{
+  padding: $size-step calc($size-step / 2 );
+}
+.tableCellInner_variant_outlined{
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .tableCell_head{
   color: $color-gray-500
 }
-.tableRow td{
+.tableCell{
   border-bottom: 1px solid $color-gray-300;
-  background: #fff;
+  background-color: #fff;
+}
+.tableCell_variant_outlined{
+  background-color: transparent;
 }
 .tableRowClickable:hover td{
   background: #F8F9FA;

package/lib/helpers/genericForwardRef.d.ts

@@ -0,0 +1,2 @@
+import { ReactNode, Ref, RefAttributes } from 'react';
+export declare function fixedForwardRef<T, P = {}>(render: (props: P, ref: Ref<T>) => ReactNode): (props: P & RefAttributes<T>) => ReactNode;

package/lib/helpers/genericForwardRef.js

@@ -0,0 +1,4 @@
+import { forwardRef } from 'react';
+export function fixedForwardRef(render) {
+  return /*#__PURE__*/forwardRef(render);
+}

package/lib/helpers/index.d.ts

@@ -0,0 +1 @@
+export * from './genericForwardRef';

package/lib/helpers/index.js

@@ -0,0 +1 @@
+export * from "./genericForwardRef";

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.114","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"build":"^0.1.4","clsx":"^2.0.0","rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}
+{"name":"armtek-uikit-react","version":"1.0.116","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"build":"^0.1.4","clsx":"^2.0.0","rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}

package/ui/Form/DateField/DateField.js

@@ -11,6 +11,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
+  var _dateValue;
   let {
     onChange,
     format = 'dd.MM.yyyy',
@@ -55,6 +56,8 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   const btnRef = useRef();
   const inputIcon = showTime && showTimeOnly ? 'schedule' : 'calendar_today';
   let dateValue = typeof realValue === 'string' ? new Date(realValue) : realValue;
+  if (!(dateValue instanceof Date && !isNaN(dateValue.getDate()))) dateValue = null;
+  console.log(dateValue);
 
   //TODO Подключение Popover ломает тесты, разобраться почему
   return /*#__PURE__*/_jsxs(_Fragment, {
@@ -66,7 +69,7 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
       error: error,
       helperText: helperText,
       ...inputProps,
-      value: (dateValue == null ? void 0 : dateValue.toLocaleDateString('ru-RU')) || '',
+      value: ((_dateValue = dateValue) == null ? void 0 : _dateValue.toLocaleDateString('ru-RU')) || '',
       onChange: () => null,
       endAdornment: /*#__PURE__*/_jsx(ButtonIcon, {
         size: 'medium',

package/ui/Table/Table.d.ts

@@ -1,4 +1,6 @@
-import { ComponentPropsWithoutRef, ReactNode, MouseEvent } from 'react';
+import { MouseEvent, ReactNode } from 'react';
+import { TableBaseProps } from './TableBase';
+import { ColorType, SizeType, VariantType } from '../../types/theme';
 type ItemType = Record<string, any>;
 type ClassesType<T extends ItemType> = {
     tableRowHead?: string;
@@ -12,12 +14,24 @@ export type TableColType<T extends ItemType> = {
     getTitle?: () => string | ReactNode | number;
     code: keyof T | string;
 };
-export type TableProps<T extends ItemType> = Omit<ComponentPropsWithoutRef<'table'>, 'onClick'> & {
+export type TableProps<T extends ItemType> = Omit<TableBaseProps, 'onClick'> & {
+    size?: SizeType;
+    variant?: VariantType;
+    color?: ColorType;
     classes?: ClassesType<T>;
     structure: TableColType<T>[];
     items: T[];
     onClick?: (item: T, e: MouseEvent<HTMLTableRowElement>) => void;
     getRow?: (item: T, index: number) => ReactNode;
 };
-export declare function Table<T extends ItemType>(props: TableProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare const Table: <T extends ItemType>(props: Omit<Omit<import("react").DetailedHTMLProps<import("react").TableHTMLAttributes<HTMLTableElement>, HTMLTableElement>, "ref">, "onClick"> & {
+    size?: SizeType | undefined;
+    variant?: VariantType | undefined;
+    color?: ColorType | undefined;
+    classes?: ClassesType<T> | undefined;
+    structure: TableColType<T>[];
+    items: T[];
+    onClick?: ((item: T, e: MouseEvent<HTMLTableRowElement>) => void) | undefined;
+    getRow?: ((item: T, index: number) => ReactNode) | undefined;
+} & import("react").RefAttributes<HTMLTableElement>) => ReactNode;
 export {};

package/ui/Table/Table.js

@@ -1,33 +1,39 @@
 import { Fragment } from 'react';
-import clsx from 'clsx';
 import { TableRow } from "./TableRow";
 import { TableCell } from "./TableCell";
-import css from "./Table.module.scss";
+import { TableBase } from "./TableBase";
+import { fixedForwardRef } from "../../lib/helpers";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-export function Table(props) {
+function TableInit(props, ref) {
   const {
     className,
     structure,
     items,
     onClick,
     classes,
+    size,
+    variant,
     getRow,
     ...tableProps
   } = props;
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsx("table", {
+    children: /*#__PURE__*/_jsx(TableBase, {
       ...tableProps,
-      className: clsx(className, css.table),
+      ref: ref,
       children: /*#__PURE__*/_jsxs("tbody", {
         children: [/*#__PURE__*/_jsx(TableRow, {
           className: classes == null ? void 0 : classes.tableRowHead,
-          children: structure.map((item, index) => /*#__PURE__*/_jsx(TableCell, {
-            head: true,
-            className: classes == null ? void 0 : classes.tableCellHead,
-            children: item.getTitle ? item.getTitle() : item.text
-          }, index))
+          children: structure.map((item, index) => {
+            return /*#__PURE__*/_jsx(TableCell, {
+              head: true,
+              className: classes == null ? void 0 : classes.tableCellHead,
+              size: size,
+              variant: variant,
+              children: item.getTitle ? item.getTitle() : item.text
+            }, index);
+          })
         }), items.map((row, index) => {
           let rowClass = !!(classes != null && classes.tableRow) ? typeof classes.tableRow === 'string' ? classes.tableRow : classes.tableRow(row) : '';
           return getRow ? /*#__PURE__*/_jsx(Fragment, {
@@ -38,6 +44,8 @@ export function Table(props) {
             children: structure.map((item, itemIndex) => {
               let cellClass = !!(classes != null && classes.tableCell) ? typeof classes.tableCell === 'string' ? classes.tableCell : classes.tableCell(row, item.code) : '';
               return /*#__PURE__*/_jsx(TableCell, {
+                size: size,
+                variant: variant,
                 className: cellClass,
                 children: item.getValue ? item.getValue(row) : row[item.code]
               }, itemIndex);
@@ -47,4 +55,5 @@ export function Table(props) {
       })
     })
   });
-}
+}
+export const Table = fixedForwardRef(TableInit);

package/ui/Table/TableBase.d.ts

@@ -0,0 +1,3 @@
+import { ComponentPropsWithoutRef } from 'react';
+export type TableBaseProps = ComponentPropsWithoutRef<'table'>;
+export declare const TableBase: import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").TableHTMLAttributes<HTMLTableElement>, HTMLTableElement>, "ref"> & import("react").RefAttributes<HTMLTableElement>>;

package/ui/Table/TableBase.js

@@ -0,0 +1,17 @@
+import { forwardRef } from 'react';
+import css from "./Table.module.scss";
+import clsx from 'clsx';
+import { jsx as _jsx } from "react/jsx-runtime";
+export const TableBase = /*#__PURE__*/forwardRef((props, ref) => {
+  const {
+    className,
+    children,
+    ...tableProps
+  } = props;
+  return /*#__PURE__*/_jsx("table", {
+    ...tableProps,
+    ref: ref,
+    className: clsx(className, css.table),
+    children: children
+  });
+});

package/ui/Table/TableCell.d.ts

@@ -1,6 +1,9 @@
 import { ComponentPropsWithoutRef } from 'react';
+import { SizeType, VariantType } from '../../types/theme';
 type TableCellProps = ComponentPropsWithoutRef<'td'> & {
     head?: boolean;
+    size?: SizeType;
+    variant?: VariantType;
 };
 export declare const TableCell: (props: TableCellProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/ui/Table/TableCell.js

@@ -7,16 +7,22 @@ export const TableCell = props => {
     className,
     children,
     head,
+    variant,
+    size,
     ...cellProps
   } = props;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx("td", {
       ...cellProps,
       className: clsx(className, css.tableCell, {
-        [css.tableCell_head]: !!head
+        [css.tableCell_head]: !!head,
+        [css['tableCell_variant_' + variant]]: !!variant
       }),
       children: /*#__PURE__*/_jsx("div", {
-        className: css.tableCellInner,
+        className: clsx(css.tableCellInner, {
+          [css['tableCellInner_size_' + size]]: !!size,
+          [css['tableCellInner_variant_' + variant]]: !!variant
+        }),
         children: children
       })
     })

package/ui/DataTable/DataTable.d.ts

@@ -1,7 +0,0 @@
-import { TableProps } from '../../ui/Table';
-type ItemType = Record<string, any>;
-export type DataTableProps<T extends ItemType> = {
-    items: T[];
-} & TableProps<T>;
-export declare function DataTable<T extends ItemType>(props: DataTableProps<T>): import("react/jsx-runtime").JSX.Element;
-export default DataTable;

package/ui/DataTable/DataTable.js

@@ -1,6 +0,0 @@
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
-export function DataTable(props) {
-  return /*#__PURE__*/_jsx(_Fragment, {});
-}
-export default DataTable;

package/ui/DataTable/index.d.ts

@@ -1,2 +0,0 @@
-export { default } from './DataTable';
-export * from './DataTable';

package/ui/DataTable/index.js

@@ -1,2 +0,0 @@
-export { default } from "./DataTable";
-export * from "./DataTable";