@gm-pc/keyboard 1.25.0-beta.0 → 1.25.0

package/src/hoc/keyboard_table_x.tsx

@@ -1,121 +1,121 @@
-import React, { ComponentType, FC, useMemo } from 'react'
-import { TableXCellProps, TableXProps } from '@gm-pc/table-x'
-import { devWarnForHook } from '@gm-common/tool'
-
-import { KeyboardTableXColumn, KeyboardTableXProps } from '../types'
-import { getColumnKey, CellKeyContext } from '../utils'
-import Wrap from '../core/wrap'
-/**
- * 请使用Table并配置isKeyboard
- * @deprecated
- */
-function keyboardTableXHOC<Props extends TableXProps = TableXProps>(
-  Table: ComponentType<Props>
-) {
-  /**
-   * 要求 props 是 id 和 onAddRow。
-   * and column 需要标志 isKeyboard，同时需要 accessor or id
-   * and 如果是 fixed，则需要提供 width，focus 的时候如果在 fixed 遮挡则需要滚动到可视区域，这时候就要用到 width 了
-   * */
-  const KeyboardTableX: FC<Props & KeyboardTableXProps> = ({
-    id,
-    onAddRow,
-    onBeforeDispatch,
-    allowAddRowOnDownKey = true,
-    ...tableProps
-  }) => {
-    const { data, columns } = tableProps
-
-    // 检测下 columns
-    // 需要提供能够 accessor or id
-    // 用 isKeyboard 也必要会用到了 Cell
-    devWarnForHook(() => {
-      columns.forEach((column: KeyboardTableXColumn) => {
-        if (column.isKeyboard && column.show !== false) {
-          if (getColumnKey(column) === null) {
-            console.error('column need accessor or id', column)
-          } else if (!column.Cell) {
-            console.error('column need Cell', column)
-          }
-        }
-
-        if (column.fixed && !column.width) {
-          console.error('column fixed need width', column)
-        }
-      })
-    })
-
-    // Cell 会产生新组建，所以需要 useMemo
-    const { columnKeys, newColumns } = useMemo(() => {
-      const columnKeys: string[] = []
-      const newColumns = columns.map((column: KeyboardTableXColumn) => {
-        // 非全键盘有效列
-        if (!(column.isKeyboard && column.show !== false)) {
-          return column
-        }
-
-        const columnKey: string = getColumnKey(column) as string
-        columnKeys.push(columnKey)
-
-        const oldCell = column.Cell
-
-        // Cell 是个方法
-        // 用 <Cell {...cellProps}/> 会导致重新渲染组件，不知道为什么
-
-        return {
-          ...column,
-          Cell: (cellProps: TableXCellProps) => (
-            <CellKeyContext.Provider value={`${cellProps.row.index}_${columnKey}`}>
-              {oldCell && oldCell(cellProps)}
-            </CellKeyContext.Provider>
-          ),
-        }
-      })
-      return { columnKeys, newColumns }
-    }, [columns])
-
-    // fix hoc 带来的问题
-    let leftFixedWidth = 0
-    let rightFixedWidth = 0
-    // useMemo(() => {
-    //   columns.forEach((column: KeyboardTableXColumn) => {
-    //     if (column.show !== false) {
-    //       if (column.fixed === 'left' && column.width) {
-    //         leftFixedWidth += column.width as number
-    //       } else if (column.fixed === 'right' && column.width) {
-    //         rightFixedWidth += column.width as number
-    //       }
-    //     }
-    //   })
-    // }, [columns])
-
-    // 这里缓存的话，会导致keyboardleft时滚动条无法跟随焦点走
-    columns.forEach((column: KeyboardTableXColumn) => {
-      if (column.show !== false) {
-        if (column.fixed === 'left' && column.width) {
-          leftFixedWidth += column.width as number
-        } else if (column.fixed === 'right' && column.width) {
-          rightFixedWidth += column.width as number
-        }
-      }
-    })
-
-    return (
-      <Wrap
-        id={id}
-        columnKeys={columnKeys}
-        fixedWidths={{ leftFixedWidth, rightFixedWidth }}
-        dataLength={data.length}
-        onAddRow={onAddRow}
-        allowAddRowOnDownKey={allowAddRowOnDownKey}
-        onBeforeDispatch={onBeforeDispatch}
-      >
-        <Table {...(tableProps as Props)} id={id} columns={newColumns} />
-      </Wrap>
-    )
-  }
-
-  return KeyboardTableX
-}
-
-export default keyboardTableXHOC
+import React, { ComponentType, FC, useMemo } from 'react'
+import { TableXCellProps, TableXProps } from '@gm-pc/table-x'
+import { devWarnForHook } from '@gm-common/tool'
+
+import { KeyboardTableXColumn, KeyboardTableXProps } from '../types'
+import { getColumnKey, CellKeyContext } from '../utils'
+import Wrap from '../core/wrap'
+/**
+ * 请使用Table并配置isKeyboard
+ * @deprecated
+ */
+function keyboardTableXHOC<Props extends TableXProps = TableXProps>(
+  Table: ComponentType<Props>
+) {
+  /**
+   * 要求 props 是 id 和 onAddRow。
+   * and column 需要标志 isKeyboard，同时需要 accessor or id
+   * and 如果是 fixed，则需要提供 width，focus 的时候如果在 fixed 遮挡则需要滚动到可视区域，这时候就要用到 width 了
+   * */
+  const KeyboardTableX: FC<Props & KeyboardTableXProps> = ({
+    id,
+    onAddRow,
+    onBeforeDispatch,
+    allowAddRowOnDownKey = true,
+    ...tableProps
+  }) => {
+    const { data, columns } = tableProps
+
+    // 检测下 columns
+    // 需要提供能够 accessor or id
+    // 用 isKeyboard 也必要会用到了 Cell
+    devWarnForHook(() => {
+      columns.forEach((column: KeyboardTableXColumn) => {
+        if (column.isKeyboard && column.show !== false) {
+          if (getColumnKey(column) === null) {
+            console.error('column need accessor or id', column)
+          } else if (!column.Cell) {
+            console.error('column need Cell', column)
+          }
+        }
+
+        if (column.fixed && !column.width) {
+          console.error('column fixed need width', column)
+        }
+      })
+    })
+
+    // Cell 会产生新组建，所以需要 useMemo
+    const { columnKeys, newColumns } = useMemo(() => {
+      const columnKeys: string[] = []
+      const newColumns = columns.map((column: KeyboardTableXColumn) => {
+        // 非全键盘有效列
+        if (!(column.isKeyboard && column.show !== false)) {
+          return column
+        }
+
+        const columnKey: string = getColumnKey(column) as string
+        columnKeys.push(columnKey)
+
+        const oldCell = column.Cell
+
+        // Cell 是个方法
+        // 用 <Cell {...cellProps}/> 会导致重新渲染组件，不知道为什么
+
+        return {
+          ...column,
+          Cell: (cellProps: TableXCellProps) => (
+            <CellKeyContext.Provider value={`${cellProps.row.index}_${columnKey}`}>
+              {oldCell && oldCell(cellProps)}
+            </CellKeyContext.Provider>
+          ),
+        }
+      })
+      return { columnKeys, newColumns }
+    }, [columns])
+
+    // fix hoc 带来的问题
+    let leftFixedWidth = 0
+    let rightFixedWidth = 0
+    // useMemo(() => {
+    //   columns.forEach((column: KeyboardTableXColumn) => {
+    //     if (column.show !== false) {
+    //       if (column.fixed === 'left' && column.width) {
+    //         leftFixedWidth += column.width as number
+    //       } else if (column.fixed === 'right' && column.width) {
+    //         rightFixedWidth += column.width as number
+    //       }
+    //     }
+    //   })
+    // }, [columns])
+
+    // 这里缓存的话，会导致keyboardleft时滚动条无法跟随焦点走
+    columns.forEach((column: KeyboardTableXColumn) => {
+      if (column.show !== false) {
+        if (column.fixed === 'left' && column.width) {
+          leftFixedWidth += column.width as number
+        } else if (column.fixed === 'right' && column.width) {
+          rightFixedWidth += column.width as number
+        }
+      }
+    })
+
+    return (
+      <Wrap
+        id={id}
+        columnKeys={columnKeys}
+        fixedWidths={{ leftFixedWidth, rightFixedWidth }}
+        dataLength={data.length}
+        onAddRow={onAddRow}
+        allowAddRowOnDownKey={allowAddRowOnDownKey}
+        onBeforeDispatch={onBeforeDispatch}
+      >
+        <Table {...(tableProps as Props)} id={id} columns={newColumns} />
+      </Wrap>
+    )
+  }
+
+  return KeyboardTableX
+}
+
+export default keyboardTableXHOC

package/src/index.ts

@@ -1,22 +1,22 @@
-import { isInputUnBoundary, scrollIntoViewFixedWidth, doFocus } from './utils'
-
-export const KeyboardUtil = { isInputUnBoundary, scrollIntoViewFixedWidth, doFocus }
-
-export { default as keyboardTableXHOC } from './hoc/keyboard_table_x'
-
-export { default as KC } from './cell/cell'
-export { default as KCAutoComplete } from './cell/auto_complete'
-export { default as KCInput } from './cell/input'
-export { default as KCMoreSelect } from './cell/more_select'
-export { default as KCInputNumber } from './cell/input_number'
-export { default as KCLevelSelect } from './cell/level_select'
-export { default as KCTableSelect } from './cell/table_select'
-export { default as KCDatePicker } from './cell/date_picker'
-export { default as KCSelect } from './cell/select'
-
-export type {
-  KeyboardTableXProps,
-  KeyboardTableXColumn,
-  KeyboardCustomEvent,
-  KeyboardDirection,
-} from './types'
+import { isInputUnBoundary, scrollIntoViewFixedWidth, doFocus } from './utils'
+
+export const KeyboardUtil = { isInputUnBoundary, scrollIntoViewFixedWidth, doFocus }
+
+export { default as keyboardTableXHOC } from './hoc/keyboard_table_x'
+
+export { default as KC } from './cell/cell'
+export { default as KCAutoComplete } from './cell/auto_complete'
+export { default as KCInput } from './cell/input'
+export { default as KCMoreSelect } from './cell/more_select'
+export { default as KCInputNumber } from './cell/input_number'
+export { default as KCLevelSelect } from './cell/level_select'
+export { default as KCTableSelect } from './cell/table_select'
+export { default as KCDatePicker } from './cell/date_picker'
+export { default as KCSelect } from './cell/select'
+
+export type {
+  KeyboardTableXProps,
+  KeyboardTableXColumn,
+  KeyboardCustomEvent,
+  KeyboardDirection,
+} from './types'