Skip to content

merge queue: checking main (759f67a) and #7093 together #7094

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: checking main (759f67a) and #7093 together #7094

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6543c55
fix: preview toggle in MD editor targets other MD editors
jadelily18 Aug 10, 2026
f65e934
Merge of #7093
mergify[bot] Aug 10, 2026
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
8 changes: 5 additions & 3 deletions packages/ui/src/components/base/MarkdownEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@
</template>
</div>
<div class="flex items-center gap-2">
<Toggle id="preview" v-model="previewMode" small />
<label class="label" for="preview">
<Toggle :id="previewId" v-model="previewMode" small />
<label class="label" :for="previewId">
{{ formatMessage(messages.editorPreviewToggleLabel) }}
</label>
</div>
Expand Down Expand Up @@ -324,7 +324,7 @@ import {
} from '@modrinth/assets'
import { markdownCommands, modrinthMarkdownEditorKeymap } from '@modrinth/utils/codemirror'
import { renderHighlightedString } from '@modrinth/utils/highlightjs'
import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, watch } from 'vue'
import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, useId, watch } from 'vue'

import { Button, IconButton } from '#ui/components/base/buttons'

Expand Down Expand Up @@ -567,6 +567,8 @@ let editor: EditorView | null = null
let isDisabledCompartment: Compartment | null = null
let editorThemeCompartment: Compartment | null = null

const previewId = useId()

const emit = defineEmits(['update:modelValue'])
const resolvedPlaceholder = computed(
() => props.placeholder ?? formatMessage(messages.editorPlaceholder),
Expand Down
Loading