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: provide find and replace functionality for the default rich text editor #5206

Merged
merged 6 commits into from
Jan 24, 2024
Merged

feat: provide find and replace functionality for the default rich text editor #5206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
683b8e3
feat: provide find and replace functionality for the default rich tex…
LIlGG Jan 22, 2024
6516aaa
Refactor icons
ruibaby Jan 22, 2024
7c91719
feat: provide find and replace functionality for the default rich tex…
LIlGG Jan 22, 2024
0cf7f9e
Merge branch 'main' of https://github.com/halo-dev/halo into feat/edi…
LIlGG Jan 22, 2024
1df33f4
Merge branch 'feat/editor-search-and-replace' of https://github.com/L…
LIlGG Jan 22, 2024
9146208
Merge branch 'main' into feat/editor-search-and-replace
LIlGG Jan 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
9 changes: 6 additions & 3 deletions console/packages/editor/src/components/EditorHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function getToolboxItemsFromExtensions() {
>
<div class="inline-flex items-center justify-center">
<VMenu>
<button class="p-1 rounded-sm hover:bg-gray-100">
<button class="p-1 rounded-sm hover:bg-gray-100" tabindex="-1">
<MdiPlusCircle class="text-[#4CCBA0]" />
</button>
<template #popper>
Expand All @@ -75,6 +75,7 @@ function getToolboxItemsFromExtensions() {
v-for="(toolboxItem, index) in getToolboxItemsFromExtensions()"
v-bind="toolboxItem.props"
:key="index"
tabindex="-1"
/>
</div>
</template>
Expand All @@ -90,9 +91,10 @@ function getToolboxItemsFromExtensions() {
:is="item.component"
v-if="!item.children?.length"
v-bind="item.props"
tabindex="-1"
/>
<VMenu v-else class="inline-flex">
<component :is="item.component" v-bind="item.props" />
<VMenu v-else class="inline-flex" tabindex="-1">
<component :is="item.component" v-bind="item.props" tabindex="-1" />
<template #popper>
<div
class="relative rounded-md bg-white overflow-hidden drop-shadow w-48 p-1 max-h-72 overflow-y-auto"
Expand All @@ -102,6 +104,7 @@ function getToolboxItemsFromExtensions() {
:is="child.component"
v-for="(child, childIndex) in item.children"
:key="childIndex"
tabindex="-1"
/>
</div>
</template>
Expand Down
1 change: 1 addition & 0 deletions console/packages/editor/src/components/toolbar/ToolbarItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ withDefaults(
]"
class="p-1 rounded-sm"
:disabled="disabled"
tabindex="-1"
@click="action"
>
<component :is="icon" />
Expand Down
2 changes: 2 additions & 0 deletions console/packages/editor/src/dev/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
ExtensionNodeSelected,
ExtensionTrailingNode,
ExtensionListKeymap,
ExtensionSearchAndReplace,
} from "../index";

const content = useLocalStorage("content", "");
Expand Down Expand Up @@ -109,6 +110,7 @@ const editor = useEditor({
ExtensionNodeSelected,
ExtensionTrailingNode,
ExtensionListKeymap,
ExtensionSearchAndReplace,
],
onUpdate: () => {
content.value = editor.value?.getHTML() + "";
Expand Down
3 changes: 3 additions & 0 deletions console/packages/editor/src/extensions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import ExtensionText from "./text";
import ExtensionDraggable from "./draggable";
import ExtensionNodeSelected from "./node-selected";
import ExtensionTrailingNode from "./trailing-node";
import ExtensionSearchAndReplace from "./search-and-replace";

const allExtensions = [
ExtensionBlockquote,
Expand Down Expand Up @@ -98,6 +99,7 @@ const allExtensions = [
ExtensionColumn,
ExtensionNodeSelected,
ExtensionTrailingNode,
ExtensionSearchAndReplace,
];

export {
Expand Down Expand Up @@ -144,4 +146,5 @@ export {
ExtensionNodeSelected,
ExtensionTrailingNode,
ExtensionListKeymap,
ExtensionSearchAndReplace,
};
Loading
Loading