Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(toolbars): updated flattenPreset #531

Merged
merged 5 commits into from
Dec 23, 2024
Merged

feat(toolbars): updated flattenPreset #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb5dd66
feat(toolbars): added ToolbarsPreset
makhnatkin Dec 18, 2024
e26cd07
feat(toolbars): fixed types
makhnatkin Dec 19, 2024
2aa3f2e
feat(toolbars): updated flattenPreset
makhnatkin Dec 19, 2024
4e492af
feat(toolbars): reverted jest.config.js, updated imports
makhnatkin Dec 21, 2024
50ccc9c
fix(toolbars): deleted console.log
makhnatkin Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bundle/MarkdownEditorView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {MToolbarData, MToolbarItemData, WToolbarData, WToolbarItemData} from './
import {useMarkdownEditorContext} from './context';
import {EditorSettings, EditorSettingsProps} from './settings';
import {stickyCn} from './sticky';
import {getToolbarsConfigs} from './toolbar/utils';
import {getToolbarsConfigs} from './toolbar/utils/toolbarsConfigs';
import type {MarkdownEditorMode} from './types';

import '../styles/styles.scss';
Expand Down
311 changes: 311 additions & 0 deletions src/bundle/toolbar/utils/flattenPreset.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,311 @@
import React from 'react';

import {ToolbarDataType} from '../../../toolbar/types';
import type {WToolbarData} from '../../config/wysiwyg';

import {flattenPreset} from './flattenPreset';

interface IconProps {}
const Icon: React.FC<IconProps> = () => {
return <div />;
};

interface WToolbarColorsProps {}
const WToolbarColors: React.FC<WToolbarColorsProps> = () => {
return <div />;
};

const input: WToolbarData = [
[
{
type: ToolbarDataType.SingleButton,
id: 'undo',
icon: {data: Icon},
hotkey: 'mod+z',
hintWhenDisabled: false,
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'redo',
icon: {data: Icon},
hotkey: 'mod+shift+z',
hintWhenDisabled: false,
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
],
[
{
type: ToolbarDataType.SingleButton,
id: 'bold',
icon: {data: Icon},
hotkey: 'mod+b',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'italic',
icon: {data: Icon},
hotkey: 'mod+i',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'underline',
icon: {data: Icon},
hotkey: 'mod+u',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'strike',
icon: {data: Icon},
hotkey: 'mod+shift+s',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'mono',
icon: {data: Icon},
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'mark',
icon: {data: Icon},
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
],
[
{
type: ToolbarDataType.ListButton,
id: 'heading',
icon: {data: Icon},
withArrow: true,
title: '',
data: [
{
id: 'paragraph',
icon: {data: Icon},
hotkey: 'cmd+alt+0',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'heading1',
icon: {data: Icon},
hotkey: 'cmd+alt+1',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'heading2',
icon: {data: Icon},
hotkey: 'cmd+alt+2',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'heading3',
icon: {data: Icon},
hotkey: 'cmd+alt+3',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'heading4',
icon: {data: Icon},
hotkey: 'cmd+alt+4',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'heading5',
icon: {data: Icon},
hotkey: 'cmd+alt+5',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'heading6',
icon: {data: Icon},
hotkey: 'cmd+alt+6',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
],
},
{
type: ToolbarDataType.ListButton,
id: 'lists',
icon: {data: Icon},
withArrow: true,
title: '',
data: [
{
id: 'bulletList',
icon: {data: Icon},
hotkey: 'mod+shift+l',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'orderedList',
icon: {data: Icon},
hotkey: 'mod+shift+m',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'sinkListItem',
icon: {data: Icon},
hotkey: 'tab',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
id: 'liftListItem',
icon: {data: Icon},
hotkey: 'shift+tab',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
],
},
{
type: ToolbarDataType.ReactComponent,
id: 'colorify',
width: 42,
component: WToolbarColors,
},
{
type: ToolbarDataType.SingleButton,
id: 'link',
icon: {data: Icon},
hotkey: 'mod+k',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'note',
icon: {data: Icon},
hotkey: 'cmd+alt+8',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'cut',
icon: {data: Icon},
hotkey: 'cmd+alt+7',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
{
type: ToolbarDataType.SingleButton,
id: 'quote',
icon: {data: Icon},
hotkey: 'mod+shift+.',
exec: () => {},
isActive: () => false,
isEnable: () => false,
title: '',
},
],
];

const expectedIds = [
'undo',
'redo',
'bold',
'italic',
'underline',
'strike',
'mono',
'mark',
'paragraph',
'heading1',
'heading2',
'heading3',
'heading4',
'heading5',
'heading6',
'bulletList',
'orderedList',
'sinkListItem',
'liftListItem',
'colorify',
'link',
'note',
'cut',
'quote',
];

describe('flattenPreset', () => {
it('should flatten nested toolbar data and return a correctly flattened structure', () => {
const result = flattenPreset(input);
const expectedOutput = expectedIds.map((id) => expect.objectContaining({id}));

expect(result).toEqual(expect.arrayContaining(expectedOutput));
});

it('should return a list of flattened IDs', () => {
const result = flattenPreset(input);
const resultIds = result.map((item) => item.id);

expect(resultIds).toEqual(expectedIds);
});
});
15 changes: 15 additions & 0 deletions src/bundle/toolbar/utils/flattenPreset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {ToolbarDataType} from '../../../toolbar/types';
import type {MToolbarData, MToolbarItemData, WToolbarData, WToolbarItemData} from '../../config';

export const flattenPreset = <T extends WToolbarData | MToolbarData>(
config: T,
): T extends WToolbarData ? WToolbarItemData[] : MToolbarItemData[] => {
return config.flat().reduce<(WToolbarItemData | MToolbarItemData)[]>((acc, item) => {
if (item.type === ToolbarDataType.ListButton && Array.isArray(item.data)) {
return acc.concat(item.data);
}

acc.push(item as WToolbarItemData | MToolbarItemData);
return acc;
}, []) as unknown as T extends WToolbarData ? WToolbarItemData[] : MToolbarItemData[];
};
Loading
Loading