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

Copy balloon toolbar input for note and snippet creation with toast #170

Merged
merged 3 commits into from
Oct 4, 2022
Merged

Copy balloon toolbar input for note and snippet creation with toast #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
093252d
Copy balloon toolbar input for note and snippet creation with toast
xypnox Oct 4, 2022
3db24c7
Remove unused link button
xypnox Oct 4, 2022
c7583e4
Remove link button style export
xypnox Oct 4, 2022
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
165 changes: 0 additions & 165 deletions apps/extension/src/Components/Editor/BalloonToolbar/components/LinkButton.tsx
View file
Open in desktop

This file was deleted.

201 changes: 106 additions & 95 deletions apps/webapp/src/Components/Editor/BalloonToolbar/EditorBalloonToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,18 @@ import {
usePlateEditorRef
} from '@udecode/plate'

import { ButtonSeparator } from '@mexit/shared'
import { ButtonSeparator, useBalloonToolbarStore } from '@mexit/shared'

import { BalloonToolbar } from './BalloonToolbar'
import { SelectionToNode } from './components/SelectionToNode'
import { SelectionToSnippet } from './components/SelectionToSnippet'

import { SelectionToNode, SelectionToNodeInput } from './components/SelectionToNode'
import { SelectionToSnippet, SelectionToSnippetInput } from './components/SelectionToSnippet'
import { SelectionToTask } from './components/SelectionToTask'

const BallonMarkToolbarButtons = () => {
const toolbarState = useBalloonToolbarStore((s) => s.toolbarState)
// const setToolbarState = useBalloonToolbarStore((s) => s.setToolbarState)

const editor = usePlateEditorRef()

const arrow = false
Expand All @@ -67,98 +71,105 @@ const BallonMarkToolbarButtons = () => {

return (
<BalloonToolbar floatingOptions={floatingOptions} theme={theme} arrow={arrow}>
<BlockToolbarButton
type={getPluginType(editor, ELEMENT_H1)}
icon={<Icon height={20} icon={h1} />}
tooltip={{ content: 'Heading 1', ...tooltip }}
/>

<BlockToolbarButton
type={getPluginType(editor, ELEMENT_H2)}
icon={<Icon height={20} icon={h2} />}
tooltip={{ content: 'Heading 2', ...tooltip }}
/>

<BlockToolbarButton
type={getPluginType(editor, ELEMENT_H3)}
icon={<Icon height={20} icon={h3} />}
tooltip={{ content: 'Heading 3', ...tooltip }}
/>
<ButtonSeparator />

<AlignToolbarButton
value="left"
tooltip={{ content: 'Align Left', ...tooltip }}
icon={<Icon icon={AlignLeftIcon} />}
/>
<AlignToolbarButton
value="center"
tooltip={{ content: 'Align Center', ...tooltip }}
icon={<Icon icon={AlignCenterIcon} />}
/>
<AlignToolbarButton
value="right"
tooltip={{ content: 'Align Right', ...tooltip }}
icon={<Icon icon={AlignRightIcon} />}
/>

<ButtonSeparator />

<BlockToolbarButton
type={getPluginType(editor, ELEMENT_BLOCKQUOTE)}
icon={<Icon height={20} icon={doubleQuotesL} />}
tooltip={{ content: 'Quote', ...tooltip }}
/>

<ListToolbarButton
type={getPluginType(editor, ELEMENT_UL)}
icon={<Icon height={20} icon={listUnordered} />}
tooltip={{ content: 'Bullet List', ...tooltip }}
/>

<ListToolbarButton
type={getPluginType(editor, ELEMENT_OL)}
icon={<Icon height={20} icon={listOrdered} />}
tooltip={{ content: 'Ordered List', ...tooltip }}
/>

<ButtonSeparator />

<MarkToolbarButton
type={getPluginType(editor, MARK_BOLD)}
icon={<Icon height={20} icon={boldIcon} />}
tooltip={{ content: 'Bold (⌘B)', ...tooltip }}
/>
<MarkToolbarButton
type={getPluginType(editor, MARK_STRIKETHROUGH)}
icon={<Icon height={20} icon={strikeThrough} />}
/>
<MarkToolbarButton
type={getPluginType(editor, MARK_ITALIC)}
icon={<Icon height={20} icon={italicIcon} />}
tooltip={{ content: 'Italic (⌘I)', ...tooltip }}
/>
<MarkToolbarButton type={getPluginType(editor, MARK_CODE)} icon={<Icon height={20} icon={codeLine} />} />

<ButtonSeparator />

<SelectionToTask
icon={<Icon height={20} icon={taskLine} />}
tooltip={{ content: 'Convert Blocks to Task', ...tooltip }}
/>

<SelectionToNode
icon={<Icon height={20} icon={addLine} />}
tooltip={{ content: 'Convert Blocks to New Node', ...tooltip }}
/>

<SelectionToSnippet
icon={<Icon height={20} icon={fileAddLine} />}
tooltip={{ content: 'Convert Blocks to New Snippet', ...tooltip }}
/>
{/* <ButtonSeparator />
<LinkButton tooltip={{ content: 'Link', ...tooltip }} icon={<Icon height={20} icon={linkIcon} />} /> */}
{/* Looses focus when used. */}
{
{
normal: (
<>
<BlockToolbarButton
type={getPluginType(editor, ELEMENT_H1)}
icon={<Icon height={20} icon={h1} />}
tooltip={{ content: 'Heading 1', ...tooltip }}
/>

<BlockToolbarButton
type={getPluginType(editor, ELEMENT_H2)}
icon={<Icon height={20} icon={h2} />}
tooltip={{ content: 'Heading 2', ...tooltip }}
/>

<BlockToolbarButton
type={getPluginType(editor, ELEMENT_H3)}
icon={<Icon height={20} icon={h3} />}
tooltip={{ content: 'Heading 3', ...tooltip }}
/>
<ButtonSeparator />

<AlignToolbarButton
value="left"
tooltip={{ content: 'Align Left', ...tooltip }}
icon={<Icon icon={AlignLeftIcon} />}
/>
<AlignToolbarButton
value="center"
tooltip={{ content: 'Align Center', ...tooltip }}
icon={<Icon icon={AlignCenterIcon} />}
/>
<AlignToolbarButton
value="right"
tooltip={{ content: 'Align Right', ...tooltip }}
icon={<Icon icon={AlignRightIcon} />}
/>

<ButtonSeparator />

<BlockToolbarButton
type={getPluginType(editor, ELEMENT_BLOCKQUOTE)}
icon={<Icon height={20} icon={doubleQuotesL} />}
tooltip={{ content: 'Quote', ...tooltip }}
/>

<ListToolbarButton
type={getPluginType(editor, ELEMENT_UL)}
icon={<Icon height={20} icon={listUnordered} />}
tooltip={{ content: 'Bullet List', ...tooltip }}
/>

<ListToolbarButton
type={getPluginType(editor, ELEMENT_OL)}
icon={<Icon height={20} icon={listOrdered} />}
tooltip={{ content: 'Ordered List', ...tooltip }}
/>

<ButtonSeparator />

<MarkToolbarButton
type={getPluginType(editor, MARK_BOLD)}
icon={<Icon height={20} icon={boldIcon} />}
tooltip={{ content: 'Bold (⌘B)', ...tooltip }}
/>
<MarkToolbarButton
type={getPluginType(editor, MARK_STRIKETHROUGH)}
icon={<Icon height={20} icon={strikeThrough} />}
/>
<MarkToolbarButton
type={getPluginType(editor, MARK_ITALIC)}
icon={<Icon height={20} icon={italicIcon} />}
tooltip={{ content: 'Italic (⌘I)', ...tooltip }}
/>
<MarkToolbarButton type={getPluginType(editor, MARK_CODE)} icon={<Icon height={20} icon={codeLine} />} />

<ButtonSeparator />

<SelectionToTask
icon={<Icon height={20} icon={taskLine} />}
tooltip={{ content: 'Convert Blocks to Task', ...tooltip }}
/>

<SelectionToNode
icon={<Icon height={20} icon={addLine} />}
tooltip={{ content: 'Convert Blocks to New Node', ...tooltip }}
/>

<SelectionToSnippet
icon={<Icon height={20} icon={fileAddLine} />}
tooltip={{ content: 'Convert Blocks to New Snippet', ...tooltip }}
/>
</>
),
'new-note': <SelectionToNodeInput />,
'new-snippet': <SelectionToSnippetInput />
}[toolbarState]
}
</BalloonToolbar>
)
}
Expand Down
Loading