Skip to content

Commit

Permalink
Merge pull request #224 from frappe/mergify/bp/master/pr-223
Browse files Browse the repository at this point in the history
fix: Misc (backport #223)
  • Loading branch information
surajshetty3416 authored Oct 19, 2024
2 parents 4c5d78e + c3bbac4 commit 2aa867c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/BoxResizer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div
class="pointer-events-auto absolute bottom-[-5px] right-[-5px] h-[12px] w-[12px] cursor-nwse-resize rounded-full border-[2.5px] border-blue-400 bg-white"
v-show="!resizing"
@mousedown.stop="handleBottomCornerResize" />
@mousedown.stop.prevent="handleBottomCornerResize" />
</template>
<script setup lang="ts">
import { getNumberFromPx } from "@/utils/helpers";
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Controls/ColorPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
@click.prevent="setColor">
<div
ref="colorSelector"
@mousedown.stop="handleSelectorMove"
class="!before:bg-[currentColor] absolute rounded-full border border-black border-opacity-20 before:absolute before:h-full before:w-full before:rounded-full before:border-2 before:border-white after:absolute after:left-[2px] after:top-[2px] after:h-[calc(100%-4px)] after:w-[calc(100%-4px)] after:rounded-full after:border after:border-black after:border-opacity-20 after:bg-transparent"
@mousedown.stop.prevent="handleSelectorMove"
class="absolute rounded-full border border-black border-opacity-20 before:absolute before:h-full before:w-full before:rounded-full before:border-2 before:border-white before:!bg-[currentColor] after:absolute after:left-[2px] after:top-[2px] after:h-[calc(100%-4px)] after:w-[calc(100%-4px)] after:rounded-full after:border after:border-black after:border-opacity-20 after:bg-transparent"
:style="
{
height: '12px',
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/components/TextBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
v-if="editor"
class="z-50 rounded-md border border-outline-gray-3 bg-surface-white p-1 text-lg text-text-icons-gray-9 shadow-2xl">
<div v-if="settingLink" class="flex">
<BuilderInput
<TextInput
v-model="textLink"
placeholder="https://example.com"
class="link-input w-56 text-sm"
class="link-input w-56 text-sm [&>input]:border-outline-gray-1 [&>input]:bg-surface-gray-2 [&>input]:text-text-icons-gray-8 [&>input]:hover:!border-outline-gray-2 [&>input]:hover:!bg-surface-gray-1 focus:[&>input]:border-outline-gray-3 focus:[&>input]:bg-surface-gray-1 focus:[&>input]:ring-outline-gray-3 [&>input]:focus-visible:bg-surface-gray-1"
@keydown.enter="
() => {
if (!linkInput) return;
setLink(linkInput?.getInputValue());
setLink(linkInput.el.value);
}
"
ref="linkInput" />
<BuilderButton @click="() => setLink(linkInput?.getInputValue())" class="ml-1">
<BuilderButton @click="() => setLink(linkInput?.el.value)" class="ml-1" variant="outline">
<FeatherIcon class="h-3 w-3" name="check" />
</BuilderButton>
<BuilderButton
Expand Down Expand Up @@ -131,7 +131,7 @@ import { Link } from "@tiptap/extension-link";
import TextStyle from "@tiptap/extension-text-style";
import StarterKit from "@tiptap/starter-kit";
import { BubbleMenu, Editor, EditorContent, Extension } from "@tiptap/vue-3";
import { Input } from "frappe-ui";
import { TextInput } from "frappe-ui";
import { Plugin, PluginKey } from "prosemirror-state";
import { Ref, computed, inject, nextTick, onBeforeMount, onBeforeUnmount, ref, watch } from "vue";
import StrikeThroughIcon from "./Icons/StrikeThrough.vue";
Expand All @@ -140,7 +140,7 @@ const store = useStore();
const dataChanged = ref(false);
const settingLink = ref(false);
const textLink = ref("");
const linkInput = ref(null) as Ref<typeof Input | null>;
const linkInput = ref(null) as Ref<typeof TextInput | null>;
const component = ref(null) as Ref<HTMLElement | null>;
const overlayElement = document.querySelector("#overlay") as HTMLElement;
let editor: Ref<Editor | null> = ref(null);
Expand Down

0 comments on commit 2aa867c

Please sign in to comment.