Skip to content

Commit

Permalink
Revert "chore(ui): bump Vue.js to 3.5 - WF-163"
Browse files Browse the repository at this point in the history
This reverts commit 07de178.
  • Loading branch information
madeindjs committed Dec 27, 2024
1 parent 07de178 commit c978e09
Show file tree
Hide file tree
Showing 17 changed files with 110 additions and 128 deletions.
156 changes: 66 additions & 90 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"vega": "^5.22.1",
"vega-embed": "^6.22.1",
"vega-lite": "^5.7.1",
"vue": "^3.5.0",
"vue": "^3.4.0",
"vue-dompurify-html": "^5.0.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<script setup lang="ts">
import * as monaco from "monaco-editor";
import "./builderEditorWorker";
import { onMounted, onUnmounted, toRefs, useTemplateRef, watch } from "vue";
import { onMounted, onUnmounted, ref, toRefs, watch } from "vue";
const rootEl = useTemplateRef("rootEl");
const editorContainerEl = useTemplateRef("editorContainerEl");
const rootEl = ref<HTMLElement>(null);
const editorContainerEl = ref<HTMLElement>(null);
const resizeObserver = new ResizeObserver(updateDimensions);
let editor: monaco.editor.IStandaloneCodeEditor = null;
Expand Down
5 changes: 2 additions & 3 deletions src/ui/src/builder/BuilderSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
nextTick,
PropType,
ref,
useTemplateRef,
watch,
} from "vue";
import { useFloating, autoPlacement } from "@floating-ui/vue";
Expand All @@ -58,8 +57,8 @@ const props = defineProps({
const currentValue = defineModel({ type: String, required: false });
const isOpen = ref(false);
const trigger = useTemplateRef("trigger");
const dropdown = useTemplateRef("dropdown");
const trigger = ref<HTMLElement>();
const dropdown = ref<HTMLElement>();
const { floatingStyles, update: updateFloatingStyle } = useFloating(
trigger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<script setup lang="ts">
import injectionKeys from "@/injectionKeys";
import { Component } from "@/writerTypes";
import { computed, inject, nextTick, ref, useTemplateRef, watch } from "vue";
import { computed, inject, nextTick, ref, watch } from "vue";
import BuilderSidebarComponentTreeBranch from "./BuilderSidebarComponentTreeBranch.vue";
import { useEvaluator } from "@/renderer/useEvaluator";
import { useDragDropComponent } from "../useDragDropComponent";
Expand All @@ -82,7 +82,7 @@ const {
const { getComponentInfoFromDrag, removeInsertionCandidacy, isParentSuitable } =
useDragDropComponent(wf);
const { isComponentVisible } = useEvaluator(wf);
const rootEl = useTemplateRef("rootEl");
const rootEl = ref<HTMLElement>(null);
const emit = defineEmits(["expandBranch"]);
const matched = computed(() => {
Expand Down
9 changes: 8 additions & 1 deletion src/ui/src/components/core/base/BaseDropdown.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { onMounted, onUnmounted, PropType, ref, useId } from "vue";
import { onMounted, onUnmounted, PropType, ref } from "vue";
defineProps({
options: {
Expand All @@ -12,6 +12,13 @@ const emits = defineEmits({
selected: (key: string) => typeof key === "string",
});
/**
* @deprecated use `useId` from Vue 3.5 when we upgrade
*/
function useId() {
return Math.random().toString();
}
const trigger = ref<Element>();
const popoverId = useId();
Expand Down
4 changes: 2 additions & 2 deletions src/ui/src/components/core/base/BaseInputColor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</template>

<script setup lang="ts">
import { PropType, computed, inject, useTemplateRef } from "vue";
import { PropType, computed, inject, ref } from "vue";
import injectionKeys from "@/injectionKeys";
const props = defineProps({
Expand All @@ -27,7 +27,7 @@ const emit = defineEmits({
change: (value: string) => typeof value === "string",
});
const pickerEl = useTemplateRef("pickerEl");
const pickerEl = ref<HTMLInputElement | undefined>();
const flattenedInstancePath = inject(injectionKeys.flattenedInstancePath);
Expand Down
Loading

0 comments on commit c978e09

Please sign in to comment.