diff --git a/src/components/select/select_motion.vue b/src/components/select/select_motion.vue index f01ec0cbd..21262c256 100644 --- a/src/components/select/select_motion.vue +++ b/src/components/select/select_motion.vue @@ -80,16 +80,10 @@ const present = computed(() => props.modelValue[props.selectedId] != null) const moveUp = async () => { const newModel = [...props.modelValue] - const movableId = Number(props.selectedId) + const movable = newModel.splice(props.selectedId, 1)[0] + newModel.splice(props.selectedId - 1, 0, movable) - const movable = newModel.slice(movableId, movableId + 1)[0] - const before = newModel.slice(0, movableId) - const after = newModel.slice(movableId + 1) - - const newBefore = before.slice(0, -1) - const newAfter = [before.slice(-1)[0], ...after] - - emit('update:modelValue', [...newBefore, movable, ...newAfter]) + emit('update:modelValue', newModel) await nextTick() emit('update:selectedId', props.selectedId - 1) } @@ -100,18 +94,12 @@ const moveDnValid = computed(() => { const moveDn = async () => { const newModel = [...props.modelValue] - const movableId = Number(props.selectedId) + const movable = newModel.splice(props.selectedId.value, 1)[0] + newModel.splice(props.selectedId + 1, 0, movable) - const movable = newModel.slice(movableId, movableId + 1)[0] - const before = newModel.slice(0, movableId) - const after = newModel.slice(movableId + 1) - - const newBefore = [...before, after.slice(0, 1)[0]] - const newAfter = after.slice(1) - - emit('update:modelValue', [...newBefore, movable, ...newAfter]) + emit('update:modelValue', newModel) await nextTick() - emit('update:selectedId', movableId + 1) + emit('update:selectedId', props.selectedId + 1) } const add = async () => { diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.scss b/src/components/settings_modal/helpers/vertical_tab_switcher.scss index f98d2d78f..cb9ac205c 100644 --- a/src/components/settings_modal/helpers/vertical_tab_switcher.scss +++ b/src/components/settings_modal/helpers/vertical_tab_switcher.scss @@ -65,8 +65,6 @@ .tab-content-wrapper { flex: 1 1 auto; height: 100%; - display: flex; - flex-direction: column; &.-hidden { display: none;