Skip to content

Commit 2aa867c

Browse files
Merge pull request #224 from frappe/mergify/bp/master/pr-223
fix: Misc (backport #223)
2 parents 4c5d78e + c3bbac4 commit 2aa867c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

frontend/src/components/BoxResizer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div
2727
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"
2828
v-show="!resizing"
29-
@mousedown.stop="handleBottomCornerResize" />
29+
@mousedown.stop.prevent="handleBottomCornerResize" />
3030
</template>
3131
<script setup lang="ts">
3232
import { getNumberFromPx } from "@/utils/helpers";

frontend/src/components/Controls/ColorPicker.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
@click.prevent="setColor">
2828
<div
2929
ref="colorSelector"
30-
@mousedown.stop="handleSelectorMove"
31-
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"
30+
@mousedown.stop.prevent="handleSelectorMove"
31+
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"
3232
:style="
3333
{
3434
height: '12px',

frontend/src/components/TextBlock.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
v-if="editor"
3030
class="z-50 rounded-md border border-outline-gray-3 bg-surface-white p-1 text-lg text-text-icons-gray-9 shadow-2xl">
3131
<div v-if="settingLink" class="flex">
32-
<BuilderInput
32+
<TextInput
3333
v-model="textLink"
3434
placeholder="https://example.com"
35-
class="link-input w-56 text-sm"
35+
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"
3636
@keydown.enter="
3737
() => {
3838
if (!linkInput) return;
39-
setLink(linkInput?.getInputValue());
39+
setLink(linkInput.el.value);
4040
}
4141
"
4242
ref="linkInput" />
43-
<BuilderButton @click="() => setLink(linkInput?.getInputValue())" class="ml-1">
43+
<BuilderButton @click="() => setLink(linkInput?.el.value)" class="ml-1" variant="outline">
4444
<FeatherIcon class="h-3 w-3" name="check" />
4545
</BuilderButton>
4646
<BuilderButton
@@ -131,7 +131,7 @@ import { Link } from "@tiptap/extension-link";
131131
import TextStyle from "@tiptap/extension-text-style";
132132
import StarterKit from "@tiptap/starter-kit";
133133
import { BubbleMenu, Editor, EditorContent, Extension } from "@tiptap/vue-3";
134-
import { Input } from "frappe-ui";
134+
import { TextInput } from "frappe-ui";
135135
import { Plugin, PluginKey } from "prosemirror-state";
136136
import { Ref, computed, inject, nextTick, onBeforeMount, onBeforeUnmount, ref, watch } from "vue";
137137
import StrikeThroughIcon from "./Icons/StrikeThrough.vue";
@@ -140,7 +140,7 @@ const store = useStore();
140140
const dataChanged = ref(false);
141141
const settingLink = ref(false);
142142
const textLink = ref("");
143-
const linkInput = ref(null) as Ref<typeof Input | null>;
143+
const linkInput = ref(null) as Ref<typeof TextInput | null>;
144144
const component = ref(null) as Ref<HTMLElement | null>;
145145
const overlayElement = document.querySelector("#overlay") as HTMLElement;
146146
let editor: Ref<Editor | null> = ref(null);

0 commit comments

Comments
 (0)