diff options
| author | Henry Jameson <me@hjkos.com> | 2024-07-21 23:45:21 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2024-07-21 23:45:21 +0300 |
| commit | 4d3d07515163bfba4304bd22f9ed7f90d32cea28 (patch) | |
| tree | bcc5bcb899e0348f1f7fa36045ae5fb808aded7a | |
| parent | 665faf892a418fa1e7aeda1d1c82d926a2ed4f3a (diff) | |
fix font selector losing list of local fonts when selecting one
| -rw-r--r-- | src/components/font_control/font_control.js | 5 | ||||
| -rw-r--r-- | src/components/font_control/font_control.vue | 2 | ||||
| -rw-r--r-- | src/modules/interface.js | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js index 08d0907e..13daa095 100644 --- a/src/components/font_control/font_control.js +++ b/src/components/font_control/font_control.js @@ -50,10 +50,11 @@ export default { return typeof this.modelValue !== 'undefined' }, localFontsList () { - return this.$store.state.interface.localFonts?.values() + console.log('FONTLIST', this.$store.state.interface.localFonts?.values()) + return this.$store.state.interface.localFonts }, localFontsSize () { - return this.$store.state.interface.localFonts?.size + return this.$store.state.interface.localFonts?.length } } } diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue index b5423a8c..fca3b360 100644 --- a/src/components/font_control/font_control.vue +++ b/src/components/font_control/font_control.vue @@ -82,7 +82,7 @@ </button> <Select :id="name + '-local-font-switcher'" - :model-value="modelValue.family" + :model-value="modelValue?.family" class="custom-font" @update:modelValue="v => $emit('update:modelValue', { ...(modelValue || {}), family: v })" > diff --git a/src/modules/interface.js b/src/modules/interface.js index 206c68a7..d4f0017a 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -112,7 +112,8 @@ const interfaceMod = { state.lastTimeline = value }, setFontsList (state, value) { - state.localFonts = new Set(value.map(font => font.family)) + // Set is used here so that we filter out duplicate fonts (possibly same font but with different weight) + state.localFonts = [...(new Set(value.map(font => font.family))).values()] } }, actions: { |