@gm-pc/keyboard 1.27.1-beta.0 → 1.27.2-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/keyboard",
-  "version": "1.27.1-beta.0",
+  "version": "1.27.2-beta.0",
   "description": "",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -27,10 +27,10 @@
   },
   "dependencies": {
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/react": "^1.27.1-beta.0",
-    "@gm-pc/table-x": "^1.27.1-beta.0",
+    "@gm-pc/react": "^1.27.2-beta.0",
+    "@gm-pc/table-x": "^1.27.2-beta.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19"
   },
-  "gitHead": "eecad3bce81dd37787dc6e90f6ecfc2ee666ad26"
+  "gitHead": "74161c54d70abebf6cd6b6f2dbbb1298841579e2"
 }

package/src/cell/auto_complete.tsx

@@ -1,79 +1,79 @@
-import React, { FC, useRef, FocusEvent, KeyboardEvent } from 'react'
-import { AutoComplete, AutoCompleteRef, AutoCompleteProps } from '@gm-pc/react'
-
-import KeyboardCell from '../core/cell'
-import { isInputUnBoundary, scrollIntoViewFixedWidth, useContextData } from '../utils'
-import { KeyboardWrapData } from '../types'
-
-const KCAutoComplete: FC<AutoCompleteProps> = (props) => {
-  const { onFocus, onKeyDown, disabled, ...rest } = props
-
-  const cellRef = useRef<KeyboardCell>(null)
-  const autoCompleteRef = useRef<AutoCompleteRef>(null)
-  const { wrapData, cellKey } = useContextData()
-
-  const handleFocus = () => {
-    // eslint-disable-next-line
-    autoCompleteRef.current?.input?.focus()
-    // eslint-disable-next-line
-    autoCompleteRef.current?.triggerPopover(true)
-  }
-
-  const handleInputFocus = (event: FocusEvent<HTMLInputElement>) => {
-    if (onFocus) {
-      onFocus(event)
-      return
-    }
-    event.target && event.target.select()
-  }
-
-  const handleScroll = (fixedWidths: KeyboardWrapData['fixedWidths']) => {
-    scrollIntoViewFixedWidth(autoCompleteRef.current!.input!, fixedWidths)
-  }
-
-  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-    onKeyDown && onKeyDown(event)
-    if (isInputUnBoundary(event)) return
-    if (
-      event.key === 'ArrowUp' ||
-      event.key === 'ArrowRight' ||
-      event.key === 'ArrowDown' ||
-      event.key === 'ArrowLeft'
-    ) {
-      // 需要阻止
-      // 如果下一个是 input，切换过去的时候光标会右移一位
-      event.preventDefault()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoDirectionByEventKey(event.key)
-    } else if (event.key === 'Tab') {
-      // 要阻止默认
-      // eslint-disable-next-line
-      cellRef.current?.apiDoTab()
-    } else if (event.key === 'Enter') {
-      // 要阻止默认
-      event.preventDefault()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoEnter()
-    }
-  }
-  return (
-    <KeyboardCell
-      ref={cellRef}
-      wrapData={wrapData}
-      cellKey={cellKey}
-      disabled={disabled}
-      onScroll={handleScroll}
-      onFocus={handleFocus}
-    >
-      <AutoComplete
-        ref={autoCompleteRef}
-        {...rest}
-        onFocus={handleInputFocus}
-        disabled={disabled}
-        onKeyDown={handleKeyDown}
-      />
-    </KeyboardCell>
-  )
-}
-
-export default KCAutoComplete
+import React, { FC, useRef, FocusEvent, KeyboardEvent } from 'react'
+import { AutoComplete, AutoCompleteRef, AutoCompleteProps } from '@gm-pc/react'
+
+import KeyboardCell from '../core/cell'
+import { isInputUnBoundary, scrollIntoViewFixedWidth, useContextData } from '../utils'
+import { KeyboardWrapData } from '../types'
+
+const KCAutoComplete: FC<AutoCompleteProps> = (props) => {
+  const { onFocus, onKeyDown, disabled, ...rest } = props
+
+  const cellRef = useRef<KeyboardCell>(null)
+  const autoCompleteRef = useRef<AutoCompleteRef>(null)
+  const { wrapData, cellKey } = useContextData()
+
+  const handleFocus = () => {
+    // eslint-disable-next-line
+    autoCompleteRef.current?.input?.focus()
+    // eslint-disable-next-line
+    autoCompleteRef.current?.triggerPopover(true)
+  }
+
+  const handleInputFocus = (event: FocusEvent<HTMLInputElement>) => {
+    if (onFocus) {
+      onFocus(event)
+      return
+    }
+    event.target && event.target.select()
+  }
+
+  const handleScroll = (fixedWidths: KeyboardWrapData['fixedWidths']) => {
+    scrollIntoViewFixedWidth(autoCompleteRef.current!.input!, fixedWidths)
+  }
+
+  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    onKeyDown && onKeyDown(event)
+    if (isInputUnBoundary(event)) return
+    if (
+      event.key === 'ArrowUp' ||
+      event.key === 'ArrowRight' ||
+      event.key === 'ArrowDown' ||
+      event.key === 'ArrowLeft'
+    ) {
+      // 需要阻止
+      // 如果下一个是 input，切换过去的时候光标会右移一位
+      event.preventDefault()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoDirectionByEventKey(event.key)
+    } else if (event.key === 'Tab') {
+      // 要阻止默认
+      // eslint-disable-next-line
+      cellRef.current?.apiDoTab()
+    } else if (event.key === 'Enter') {
+      // 要阻止默认
+      event.preventDefault()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoEnter()
+    }
+  }
+  return (
+    <KeyboardCell
+      ref={cellRef}
+      wrapData={wrapData}
+      cellKey={cellKey}
+      disabled={disabled}
+      onScroll={handleScroll}
+      onFocus={handleFocus}
+    >
+      <AutoComplete
+        ref={autoCompleteRef}
+        {...rest}
+        onFocus={handleInputFocus}
+        disabled={disabled}
+        onKeyDown={handleKeyDown}
+      />
+    </KeyboardCell>
+  )
+}
+
+export default KCAutoComplete

package/src/cell/cell.tsx

@@ -1,27 +1,27 @@
-import React, { FC } from 'react'
-import { useContextData } from '../utils'
-
-import KeyboardCell from '../core/cell'
-import { KeyboardCellProps } from '../types'
-
-const KC: FC<Pick<KeyboardCellProps, 'onFocus' | 'onScroll' | 'disabled'>> = ({
-  onFocus,
-  onScroll,
-  disabled,
-  children,
-}) => {
-  const { wrapData, cellKey } = useContextData()
-  return (
-    <KeyboardCell
-      wrapData={wrapData}
-      cellKey={cellKey}
-      disabled={disabled}
-      onScroll={onScroll}
-      onFocus={onFocus}
-    >
-      {children}
-    </KeyboardCell>
-  )
-}
-
-export default KC
+import React, { FC } from 'react'
+import { useContextData } from '../utils'
+
+import KeyboardCell from '../core/cell'
+import { KeyboardCellProps } from '../types'
+
+const KC: FC<Pick<KeyboardCellProps, 'onFocus' | 'onScroll' | 'disabled'>> = ({
+  onFocus,
+  onScroll,
+  disabled,
+  children,
+}) => {
+  const { wrapData, cellKey } = useContextData()
+  return (
+    <KeyboardCell
+      wrapData={wrapData}
+      cellKey={cellKey}
+      disabled={disabled}
+      onScroll={onScroll}
+      onFocus={onFocus}
+    >
+      {children}
+    </KeyboardCell>
+  )
+}
+
+export default KC

package/src/cell/date_picker.tsx

@@ -1,73 +1,73 @@
-import React, { FC, useRef, KeyboardEvent } from 'react'
-import { DatePicker, DatePickerProps } from '@gm-pc/react'
-import { findDOMNode } from 'react-dom'
-
-import KeyboardCell from '../core/cell'
-import { scrollIntoViewFixedWidth, useContextData } from '../utils'
-import { KeyboardWrapData } from '../types'
-
-const KCDatePicker: FC<DatePickerProps> = ({ disabled, onKeyDown, ...rest }) => {
-  const cellRef = useRef<KeyboardCell>(null)
-  const targetRef = useRef<DatePicker>(null)
-  const { wrapData, cellKey } = useContextData()
-
-  const handleScroll = (fixedWidths: KeyboardWrapData['fixedWidths']) => {
-    scrollIntoViewFixedWidth(findDOMNode(targetRef.current) as HTMLElement, fixedWidths)
-  }
-
-  const handleFocus = () => {
-    if (targetRef.current) {
-      targetRef.current.apiDoFocus()
-    }
-  }
-
-  const handleKeyDown = (event: KeyboardEvent) => {
-    onKeyDown && onKeyDown(event)
-    if (
-      event.key === 'ArrowUp' ||
-      event.key === 'ArrowDown' ||
-      event.key === 'ArrowLeft' ||
-      event.key === 'ArrowRight'
-    ) {
-      // 需要阻止。
-      // 如果下一个是input，切过去的时候光标会右移一位是 keydown
-      event.preventDefault()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoDirectionByEventKey(event.key)
-    } else if (event.key === 'Tab') {
-      // 要阻止默认的
-      event.preventDefault()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoTab()
-    } else if (event.key === 'Enter') {
-      // 要阻止默认的
-      event.preventDefault()
-      // enter 要选择
-      // eslint-disable-next-line
-      targetRef.current?.apiDoSelectWillActive()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoEnter()
-    }
-  }
-
-  return (
-    <KeyboardCell
-      disabled={disabled}
-      ref={cellRef}
-      wrapData={wrapData}
-      cellKey={cellKey}
-      onFocus={handleFocus}
-      onScroll={handleScroll}
-    >
-      <DatePicker
-        disabled={disabled}
-        {...rest}
-        popoverType='realFocus'
-        onKeyDown={handleKeyDown}
-        ref={targetRef}
-      />
-    </KeyboardCell>
-  )
-}
-
-export default KCDatePicker
+import React, { FC, useRef, KeyboardEvent } from 'react'
+import { DatePicker, DatePickerProps } from '@gm-pc/react'
+import { findDOMNode } from 'react-dom'
+
+import KeyboardCell from '../core/cell'
+import { scrollIntoViewFixedWidth, useContextData } from '../utils'
+import { KeyboardWrapData } from '../types'
+
+const KCDatePicker: FC<DatePickerProps> = ({ disabled, onKeyDown, ...rest }) => {
+  const cellRef = useRef<KeyboardCell>(null)
+  const targetRef = useRef<DatePicker>(null)
+  const { wrapData, cellKey } = useContextData()
+
+  const handleScroll = (fixedWidths: KeyboardWrapData['fixedWidths']) => {
+    scrollIntoViewFixedWidth(findDOMNode(targetRef.current) as HTMLElement, fixedWidths)
+  }
+
+  const handleFocus = () => {
+    if (targetRef.current) {
+      targetRef.current.apiDoFocus()
+    }
+  }
+
+  const handleKeyDown = (event: KeyboardEvent) => {
+    onKeyDown && onKeyDown(event)
+    if (
+      event.key === 'ArrowUp' ||
+      event.key === 'ArrowDown' ||
+      event.key === 'ArrowLeft' ||
+      event.key === 'ArrowRight'
+    ) {
+      // 需要阻止。
+      // 如果下一个是input，切过去的时候光标会右移一位是 keydown
+      event.preventDefault()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoDirectionByEventKey(event.key)
+    } else if (event.key === 'Tab') {
+      // 要阻止默认的
+      event.preventDefault()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoTab()
+    } else if (event.key === 'Enter') {
+      // 要阻止默认的
+      event.preventDefault()
+      // enter 要选择
+      // eslint-disable-next-line
+      targetRef.current?.apiDoSelectWillActive()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoEnter()
+    }
+  }
+
+  return (
+    <KeyboardCell
+      disabled={disabled}
+      ref={cellRef}
+      wrapData={wrapData}
+      cellKey={cellKey}
+      onFocus={handleFocus}
+      onScroll={handleScroll}
+    >
+      <DatePicker
+        disabled={disabled}
+        {...rest}
+        popoverType='realFocus'
+        onKeyDown={handleKeyDown}
+        ref={targetRef}
+      />
+    </KeyboardCell>
+  )
+}
+
+export default KCDatePicker

package/src/cell/input.tsx

@@ -1,75 +1,75 @@
-import React, { FC, useRef, FocusEvent, KeyboardEvent } from 'react'
-import { Input, InputProps } from '@gm-pc/react'
-
-import KeyboardCell from '../core/cell'
-import { isInputUnBoundary, scrollIntoViewFixedWidth, useContextData } from '../utils'
-import { KeyboardWrapData } from '../types'
-
-const KCInput: FC<InputProps> = ({ disabled, onKeyDown, onFocus, ...rest }) => {
-  const cellRef = useRef<KeyboardCell>(null)
-  const targetRef = useRef<HTMLInputElement>(null)
-  const { wrapData, cellKey } = useContextData()
-
-  const handleFocus = () => {
-    // eslint-disable-next-line
-    targetRef.current?.focus()
-  }
-
-  const handleInputFocus = (event: FocusEvent<HTMLInputElement>) => {
-    if (onFocus) {
-      onFocus(event)
-      return
-    }
-    event.target && event.target.select()
-  }
-
-  const handleScroll = (fixedWidths: KeyboardWrapData['fixedWidths']) => {
-    scrollIntoViewFixedWidth(targetRef.current!, fixedWidths)
-  }
-
-  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-    onKeyDown && onKeyDown(event)
-    if (isInputUnBoundary(event)) return
-    if (
-      event.key === 'ArrowUp' ||
-      event.key === 'ArrowRight' ||
-      event.key === 'ArrowDown' ||
-      event.key === 'ArrowLeft'
-    ) {
-      // 需要阻止
-      // 如果下一个是 input，切换过去的时候光标会右移一位
-      event.preventDefault()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoDirectionByEventKey(event.key)
-    } else if (event.key === 'Tab') {
-      // 要阻止默认
-      // eslint-disable-next-line
-      cellRef.current?.apiDoTab()
-    } else if (event.key === 'Enter') {
-      // 要阻止默认
-      event.preventDefault()
-      // eslint-disable-next-line
-      cellRef.current?.apiDoEnter()
-    }
-  }
-  return (
-    <KeyboardCell
-      ref={cellRef}
-      wrapData={wrapData}
-      cellKey={cellKey}
-      disabled={disabled}
-      onScroll={handleScroll}
-      onFocus={handleFocus}
-    >
-      <Input
-        ref={targetRef}
-        {...rest}
-        onFocus={handleInputFocus}
-        disabled={disabled}
-        onKeyDown={handleKeyDown}
-      />
-    </KeyboardCell>
-  )
-}
-
-export default KCInput
+import React, { FC, useRef, FocusEvent, KeyboardEvent } from 'react'
+import { Input, InputProps } from '@gm-pc/react'
+
+import KeyboardCell from '../core/cell'
+import { isInputUnBoundary, scrollIntoViewFixedWidth, useContextData } from '../utils'
+import { KeyboardWrapData } from '../types'
+
+const KCInput: FC<InputProps> = ({ disabled, onKeyDown, onFocus, ...rest }) => {
+  const cellRef = useRef<KeyboardCell>(null)
+  const targetRef = useRef<HTMLInputElement>(null)
+  const { wrapData, cellKey } = useContextData()
+
+  const handleFocus = () => {
+    // eslint-disable-next-line
+    targetRef.current?.focus()
+  }
+
+  const handleInputFocus = (event: FocusEvent<HTMLInputElement>) => {
+    if (onFocus) {
+      onFocus(event)
+      return
+    }
+    event.target && event.target.select()
+  }
+
+  const handleScroll = (fixedWidths: KeyboardWrapData['fixedWidths']) => {
+    scrollIntoViewFixedWidth(targetRef.current!, fixedWidths)
+  }
+
+  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    onKeyDown && onKeyDown(event)
+    if (isInputUnBoundary(event)) return
+    if (
+      event.key === 'ArrowUp' ||
+      event.key === 'ArrowRight' ||
+      event.key === 'ArrowDown' ||
+      event.key === 'ArrowLeft'
+    ) {
+      // 需要阻止
+      // 如果下一个是 input，切换过去的时候光标会右移一位
+      event.preventDefault()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoDirectionByEventKey(event.key)
+    } else if (event.key === 'Tab') {
+      // 要阻止默认
+      // eslint-disable-next-line
+      cellRef.current?.apiDoTab()
+    } else if (event.key === 'Enter') {
+      // 要阻止默认
+      event.preventDefault()
+      // eslint-disable-next-line
+      cellRef.current?.apiDoEnter()
+    }
+  }
+  return (
+    <KeyboardCell
+      ref={cellRef}
+      wrapData={wrapData}
+      cellKey={cellKey}
+      disabled={disabled}
+      onScroll={handleScroll}
+      onFocus={handleFocus}
+    >
+      <Input
+        ref={targetRef}
+        {...rest}
+        onFocus={handleInputFocus}
+        disabled={disabled}
+        onKeyDown={handleKeyDown}
+      />
+    </KeyboardCell>
+  )
+}
+
+export default KCInput