Skip to content

Commit 0023917

Browse files
authored
Merge pull request #1812 from merico-dev/rich-text-interaction-block-text-align
rich text interaction block text align
2 parents ec33c12 + c0b3177 commit 0023917

File tree

6 files changed

+29
-19
lines changed

6 files changed

+29
-19
lines changed

dashboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/dashboard",
3-
"version": "14.58.2",
3+
"version": "14.58.3",
44
"license": "Apache-2.0",
55
"repository": {
66
"url": "https://github.com/merico-dev/table"

dashboard/src/components/widgets/rich-text-editor/interaction-block-node/interaction-block-control.tsx

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,12 @@ function InteractionBlockModal({ opened, onClose, editor }: InteractionBlockModa
5252
}, [opened]);
5353

5454
return (
55-
<Modal
56-
opened={opened}
57-
zIndex={1200}
58-
onClose={handleCancel}
59-
title={t('rich_text_editor.interaction_block.modal_title')}
60-
>
55+
<Modal opened={opened} zIndex={1200} onClose={handleCancel} title={t('rich_text.interaction_block.modal_title')}>
6156
<Stack gap="md">
6257
<TextInput
63-
label={t('rich_text_editor.interaction_block.block_id_label')}
64-
description={t('rich_text_editor.interaction_block.block_id_description')}
65-
placeholder={t('rich_text_editor.interaction_block.block_id_placeholder')}
58+
label={t('rich_text.interaction_block.block_id_label')}
59+
description={t('rich_text.interaction_block.block_id_description')}
60+
placeholder={t('rich_text.interaction_block.block_id_placeholder')}
6661
value={blockId}
6762
onChange={(e) => setBlockId(e.currentTarget.value)}
6863
onKeyDown={(e) => {
@@ -103,8 +98,8 @@ export function InteractionBlockControl() {
10398
<RichTextEditor.Control
10499
onClick={handleControlClick}
105100
active={isActive}
106-
aria-label={t('rich_text_editor.interaction_block.toggle_tooltip')}
107-
title={t('rich_text_editor.interaction_block.toggle_tooltip')}
101+
aria-label={t('rich_text.interaction_block.toggle_tooltip')}
102+
title={t('rich_text.interaction_block.toggle_tooltip')}
108103
>
109104
<IconHandClick stroke={1.5} size={16} />
110105
</RichTextEditor.Control>
@@ -131,8 +126,8 @@ export function ClearInteractionBlockControl() {
131126
<RichTextEditor.Control
132127
onClick={handleClearClick}
133128
disabled={!isActive}
134-
aria-label={t('rich_text_editor.interaction_block.clear_tooltip')}
135-
title={t('rich_text_editor.interaction_block.clear_tooltip')}
129+
aria-label={t('rich_text.interaction_block.clear_tooltip')}
130+
title={t('rich_text.interaction_block.clear_tooltip')}
136131
>
137132
<IconHandOff stroke={1.5} size={16} />
138133
</RichTextEditor.Control>

dashboard/src/i18n/en.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,14 @@ export const en = {
659659
var: 'Max value variable',
660660
},
661661
},
662+
interaction_block: {
663+
modal_title: 'Configure Interaction Block',
664+
block_id_label: 'Block ID',
665+
block_id_description: 'Unique identifier for this interaction block',
666+
block_id_placeholder: 'Enter block ID',
667+
toggle_tooltip: 'Toggle interaction block settings',
668+
clear_tooltip: 'Clear interaction block',
669+
},
662670
},
663671
chart: {
664672
chart_config: 'Chart Config',

dashboard/src/i18n/zh.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,14 @@ export const zh = {
659659
var: '动态最大值(优先)',
660660
},
661661
},
662+
interaction_block: {
663+
modal_title: '配置交互块',
664+
block_id_label: '块ID',
665+
block_id_description: '此交互块的唯一标识符',
666+
block_id_placeholder: '输入块ID',
667+
toggle_tooltip: '切换交互块设置',
668+
clear_tooltip: '清除交互块',
669+
},
662670
},
663671
chart: {
664672
chart_config: '图表设置',

dashboard/src/styles/common-html-content-style.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,16 @@ export const CommonHTMLContentStyle: EmotionSx = {
7272
color: '#3D3E45',
7373
margin: '0 0 14px',
7474
},
75-
'div[data-interaction-block-id]': {
75+
'[data-interaction-block-id]': {
7676
position: 'relative',
7777
padding: '4px 8px',
7878
borderRadius: '4px',
7979
transition: 'all 0.2s ease',
80-
width: 'fit-content',
8180
},
82-
'div[data-interaction-block-id]:hover': {
81+
'[data-interaction-block-id]:hover': {
8382
backgroundColor: 'rgba(59, 130, 246, 0.08)',
8483
},
85-
'[contenteditable=false] div[data-interaction-block-id]:hover': {
84+
'[contenteditable=false] [data-interaction-block-id]:hover': {
8685
cursor: 'pointer',
8786
},
8887
};

settings-form/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/settings-form",
3-
"version": "14.58.2",
3+
"version": "14.58.3",
44
"license": "Apache-2.0",
55
"repository": {
66
"url": "https://github.com/merico-dev/table"

0 commit comments

Comments
 (0)