Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
feat(design): add `Textarea` component (#1778)
白熱a2dd33d91458
diff --git a/packages/design/package.json b/packages/design/package.jsonindex 3c80e053ed..94a982638f 100644--- a/packages/design/package.json+++ b/packages/design/package.json@@ -83,6 +83,7 @@"rc-picker": "^4.3.0","rc-segmented": "^2.3.0","rc-select": "^14.13.0",+ "rc-textarea": "^1.6.3","rc-tooltip": "^6.2.0","rc-util": "^5.39.1","react-draggable": "^4.4.6",diff --git a/packages/design/src/components/input/Input.stories.tsx b/packages/design/src/components/input/Input.stories.tsxindex 05a11c6913..da393c18cc 100644--- a/packages/design/src/components/input/Input.stories.tsx+++ b/packages/design/src/components/input/Input.stories.tsx@@ -45,7 +45,6 @@ export const InputSize = {render() {return (<>- <Input size="mini" /><Input size="small" /><Input /><Input size="large" />diff --git a/packages/design/src/components/input/Input.tsx b/packages/design/src/components/input/Input.tsxindex fb2d9de0e3..379221942e 100644--- a/packages/design/src/components/input/Input.tsx+++ b/packages/design/src/components/input/Input.tsx@@ -59,7 +59,7 @@ export interface IInputProps extends Pick<InputProps, 'onFocus' | 'onBlur'> {* The input size* @default middle*/- size?: 'mini' | 'small' | 'middle' | 'large';+ size?: 'small' | 'middle' | 'large';/*** Whether the input is clearable@@ -116,7 +116,6 @@ export function Input(props: IInputProps) {}const _className = clsx(className, {- [styles.inputAffixWrapperMini]: size === 'mini',[styles.inputAffixWrapperSmall]: size === 'small',[styles.inputAffixWrapperMiddle]: size === 'middle',[styles.inputAffixWrapperLarge]: size === 'large',diff --git a/packages/design/src/components/input/InputWithSlot.tsx b/packages/design/src/components/input/InputWithSlot.tsxindex 4c2f633781..2c8312e425 100644--- a/packages/design/src/components/input/InputWithSlot.tsx+++ b/packages/design/src/components/input/InputWithSlot.tsx@@ -26,10 +26,8 @@ export interface IInputWithSlotProps extends IInputProps {slot: React.ReactNode;}-function getPaddingRightBySize(size?: 'mini' | 'small' | 'middle' | 'large'): number {+function getPaddingRightBySize(size?: 'small' | 'middle' | 'large'): number {switch (size) {- case 'mini':- return 2;case 'small':return 6;case 'middle':diff --git a/packages/design/src/components/input/index.module.less b/packages/design/src/components/input/index.module.lessindex 1ec1b55ca9..e4b5b09477 100644--- a/packages/design/src/components/input/index.module.less+++ b/packages/design/src/components/input/index.module.less@@ -24,27 +24,24 @@transition: all 0.15s;- &-mini {- display: inline-block;- padding: 2px var(--padding-lg);- font-size: var(--font-size-xs);- }-&-small {display: inline-block;- padding: 6px var(--padding-lg);- font-size: var(--font-size-xs);+ width: 136px;+ padding: 4px var(--padding-sm);+ font-size: var(--font-size-sm);}&-middle {display: inline-block;- padding: 6px var(--padding-lg);+ width: 200px;+ padding: 5px var(--padding-sm);font-size: var(--font-size-sm);}&-large {display: inline-block;- padding: 8px var(--padding-lg);+ width: 280px;+ padding: 6px var(--padding-sm);font-size: var(--font-size-sm);}diff --git a/packages/design/src/components/textarea/Textarea.stories.tsx b/packages/design/src/components/textarea/Textarea.stories.tsxnew file mode 100644index 0000000000..a3207f7683--- /dev/null+++ b/packages/design/src/components/textarea/Textarea.stories.tsx@@ -0,0 +1,47 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { Meta } from '@storybook/react';+import React from 'react';++import { Textarea } from './Textarea';++const meta: Meta<typeof Textarea> = {+ title: 'Components / Textarea',+ component: Textarea,+ parameters: {+ layout: 'centered',+ },+ tags: ['autodocs'],+};++export default meta;++export const TextareaBasic = {+ render() {+ return (+ <>+ <Textarea autoSize={{ minRows: 4 }} />+ </>+ );+ },+};++export const TextareaDisabled = {+ render() {+ return <Textarea disabled />;+ },+};diff --git a/packages/design/src/components/textarea/Textarea.tsx b/packages/design/src/components/textarea/Textarea.tsxnew file mode 100644index 0000000000..330faad699--- /dev/null+++ b/packages/design/src/components/textarea/Textarea.tsx@@ -0,0 +1,111 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import clsx from 'clsx';+import type { TextAreaProps } from 'rc-textarea';+import RcTextarea from 'rc-textarea';+import React from 'react';++import styles from './index.module.less';++export interface ITextareaProps extends Pick<TextAreaProps, 'onFocus' | 'onBlur'> {+ /**+ * Whether the input is autoFocus+ * @default false+ */+ autoFocus?: boolean;++ /**+ * The input class name+ */+ className?: string;++ /**+ * The input affix wrapper style+ */+ style?: React.CSSProperties;++ /**+ * The input affix wrapper style+ */+ autoSize?: boolean | { minRows?: number; maxRows?: number };++ /**+ * The input placeholder+ */+ placeholder?: string;++ /**+ * The input content value+ */+ value?: string;++ /**+ * Whether the input is disabled+ * @default false+ */+ disabled?: boolean;++ /**+ * Callback when user press a key+ * @param e+ */+ onKeyDown?: React.KeyboardEventHandler;++ /**+ * Callback when user input+ * @param value+ */+ onChange?: (value: string) => void;++}++export function Textarea(props: ITextareaProps) {+ const {+ autoFocus = false,+ autoSize = false,+ className,+ placeholder,+ value,+ disabled = false,+ onKeyDown,+ onChange,+ ...rest+ } = props;++ function handleChange(e: React.ChangeEvent<HTMLTextAreaElement>) {+ const { value } = e.target;+ onChange?.(value);+ }++ const _className = clsx(className, {+ }, className);++ return (+ <RcTextarea+ prefixCls={styles.textarea}+ classNames={{ affixWrapper: _className }}+ autoFocus={autoFocus}+ autoSize={autoSize}+ placeholder={placeholder}+ value={value}+ disabled={disabled}+ onKeyDown={onKeyDown}+ onChange={handleChange}+ {...rest}+ />+ );+}diff --git a/packages/design/src/components/textarea/index.module.less b/packages/design/src/components/textarea/index.module.lessnew file mode 100644index 0000000000..1250ab178f--- /dev/null+++ b/packages/design/src/components/textarea/index.module.less@@ -0,0 +1,24 @@+@textarea-prefix-cls: textarea;++.@{textarea-prefix-cls} {+ position: relative;++ width: 280px;++ padding: var(--padding-sm);++ box-sizing: border-box;++ border: 1px solid rgb(var(--border-color));+ border-radius: var(--border-radius-base);++ overflow: hidden;++ transition: all 0.15s;++ &:hover,+ &:focus {+ border-color: rgb(var(--primary-color));+ outline: none;+ }+}diff --git a/packages/design/src/components/textarea/index.ts b/packages/design/src/components/textarea/index.tsnew file mode 100644index 0000000000..723d259a75--- /dev/null+++ b/packages/design/src/components/textarea/index.ts@@ -0,0 +1,17 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++export { type ITextareaProps, Textarea } from './Textarea';diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/highlightCell.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/highlightCell.tsxindex 5c270a2d97..16bab70e53 100644--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/highlightCell.tsx+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/highlightCell.tsx@@ -23,17 +23,20 @@ import { CFNumberOperator,CFSubRuleType,CFTextOperator,CFTimePeriodOperator,- createDefaultValue } from '@univerjs/sheets-conditional-formatting';+ createDefaultValue,+} from '@univerjs/sheets-conditional-formatting';import type {IConditionalFormattingRuleConfig,IHighlightCell,INumberHighlightCell,ITextHighlightCell,- ITimePeriodHighlightCell } from '@univerjs/sheets-conditional-formatting';+ ITimePeriodHighlightCell,+} from '@univerjs/sheets-conditional-formatting';import { ConditionalStyleEditor } from '../../conditional-style-editor';import { Preview } from '../../preview';import stylesBase from '../index.module.less';import type { IStyleEditorProps } from './type';+import styles from './index.module.less';const createOptionItem = (text: string, localeService: LocaleService) => ({ label: localeService.t(`sheet.cf.operator.${text}`), value: text });diff --git a/packages/ui/src/components/range-selector/RangeSelector.tsx b/packages/ui/src/components/range-selector/RangeSelector.tsxindex 9a77a8da8b..9e92947317 100644--- a/packages/ui/src/components/range-selector/RangeSelector.tsx+++ b/packages/ui/src/components/range-selector/RangeSelector.tsx@@ -39,7 +39,7 @@ export interface IRangeSelectorProps {openForSheetUnitId?: Nullable<string>; // Configuring which workbook the selector defaults to opening in determines whether the ref includes a [unitId] prefix.openForSheetSubUnitId?: Nullable<string>; // Configuring the default worksheet where the selector opens determines whether the ref includes a [unitId]sheet1 prefix.width?: number; // The width of the selector.- size?: 'mini' | 'small' | 'middle' | 'large'; // The size of the selector.+ size?: 'small' | 'middle' | 'large'; // The size of the selector.placeholder?: string; // Placeholder text.className?: string;}@@ -279,9 +279,7 @@ export function RangeSelector(props: IRangeSelectorProps) {}let height = 32;- if (size === 'mini') {- height = 24;- } else if (size === 'small') {+ if (size === 'small') {height = 28;} else if (size === 'large') {height = 36;@@ -317,7 +315,15 @@ export function RangeSelector(props: IRangeSelectorProps) {{rangeDataList.map((item, index) => (<div key={index} className={styles.rangeSelectorModalContainer}><div style={{ width: rangeDataList.length === 1 ? '280px' : '252px' }} className={styles.rangeSelectorModalContainerInput}>- <Input className={currentInputIndex === index ? styles.rangeSelectorModalContainerInputActive : ((rangeDataList.length - 1 === index && currentInputIndex === -1) ? styles.rangeSelectorModalContainerInputActive : '')} placeholder={localeService.t('rangeSelector.placeHolder')} affixWrapperStyle={{ width: '100%' }} key={`input${index}`} onClick={() => setCurrentInputIndex(index)} value={item} onChange={(value) => changeItem(index, value)} />+ <Input+ className={currentInputIndex === index ? styles.rangeSelectorModalContainerInputActive : ((rangeDataList.length - 1 === index && currentInputIndex === -1) ? styles.rangeSelectorModalContainerInputActive : '')}+ placeholder={localeService.t('rangeSelector.placeHolder')}+ affixWrapperStyle={{ width: '100%' }}+ key={`input${index}`}+ onClick={() => setCurrentInputIndex(index)}+ value={item}+ onChange={(value) => changeItem(index, value)}+ /></div><div style={{ display: rangeDataList.length === 1 ? 'none' : 'inline-block' }} className={styles.rangeSelectorModalContainerButton}><DeleteSingle onClick={() => removeItem(index)} />diff --git a/packages/uniscript/package.json b/packages/uniscript/package.jsonindex 8355057f99..80f1802815 100644--- a/packages/uniscript/package.json+++ b/packages/uniscript/package.json@@ -81,7 +81,6 @@"@univerjs/design": "workspace:*","@univerjs/facade": "workspace:*","@univerjs/shared": "workspace:*",- "@univerjs/sheets": "workspace:*","@univerjs/ui": "workspace:*","@wendellhu/redi": "^0.13.0","less": "^4.2.0",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex b149739dc5..cd816c5cf0 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -420,6 +420,9 @@ importers:rc-select:specifier: ^14.13.0version: 14.13.0([email protected])([email protected])+ rc-textarea:+ specifier: ^1.6.3+ version: 1.6.3([email protected])([email protected])rc-tooltip:specifier: ^6.2.0version: 6.2.0([email protected])([email protected])@@ -1446,9 +1449,6 @@ importers:'@univerjs/shared':specifier: workspace:*version: link:../../common/shared- '@univerjs/sheets':- specifier: workspace:*- version: link:../sheets'@univerjs/ui':specifier: workspace:*version: link:../ui@@ -12470,6 +12470,21 @@ packages:react-dom: 18.2.0([email protected])dev: false+ resolution: {integrity: sha512-8k7+8Y2GJ/cQLiClFMg8kUXOOdvcFQrnGeSchOvI2ZMIVvX5a3zQpLxoODL0HTrvU63fPkRmMuqaEcOF9dQemA==}+ peerDependencies:+ react: '>=16.9.0'+ react-dom: '>=16.9.0'+ dependencies:+ '@babel/runtime': 7.24.1+ classnames: 2.5.1+ rc-input: 1.4.5([email protected])([email protected])+ rc-resize-observer: 1.4.0([email protected])([email protected])+ rc-util: 5.39.1([email protected])([email protected])+ react: 18.2.0+ react-dom: 18.2.0([email protected])+ dev: false+resolution: {integrity: sha512-iS/3iOAvtDh9GIx1ulY7EFUXUtktFccNLsARo3NPgLf0QW9oT0w3dA9cYWlhqAKmD+uriEwdWz1kH0Qs4zk2Aw==}peerDependencies: