Skip to content

Commit 573e1a3

Browse files
committed
🎨 Add data-id attributes to elements in the font appearance menu
fix #12518
1 parent bbe45a9 commit 573e1a3

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

app/src/mobile/util/keyboardToolbar.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => {
6767
lastColorHTML = `<div data-id="lastUsed" class="keyboard__slash-title">
6868
${window.siyuan.languages.lastUsed}
6969
</div>
70-
<div class="keyboard__slash-block">`;
70+
<div data-id="lastUsedWrap" class="keyboard__slash-block">`;
7171
lastFonts.forEach((item: string) => {
7272
const lastFontStatus = item.split(Constants.ZWSP);
7373
switch (lastFontStatus[0]) {
@@ -138,7 +138,7 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => {
138138
const utilElement = toolbarElement.querySelector(".keyboard__util") as HTMLElement;
139139
utilElement.innerHTML = `${lastColorHTML}
140140
<div data-id="color" class="keyboard__slash-title">${window.siyuan.languages.color}</div>
141-
<div class="keyboard__slash-block">
141+
<div data-id="colorWrap" class="keyboard__slash-block">
142142
<button class="keyboard__slash-item" data-type="style1">
143143
<span class="keyboard__slash-icon">A</span>
144144
<span class="keyboard__slash-text">${window.siyuan.languages.color} ${window.siyuan.languages.default}</span>
@@ -161,15 +161,15 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => {
161161
</button>
162162
</div>
163163
<div data-id="colorFont" class="keyboard__slash-title">${window.siyuan.languages.colorFont}</div>
164-
<div class="keyboard__slash-block">
164+
<div data-id="colorFontWrap" class="keyboard__slash-block">
165165
${colorHTML}
166166
</div>
167167
<div data-id="colorPrimary" class="keyboard__slash-title">${window.siyuan.languages.colorPrimary}</div>
168-
<div class="keyboard__slash-block">
168+
<div data-id="colorPrimaryWrap" class="keyboard__slash-block">
169169
${bgHTML}
170170
</div>
171171
<div data-id="fontStyle" class="keyboard__slash-title">${window.siyuan.languages.fontStyle}</div>
172-
<div class="keyboard__slash-block">
172+
<div data-id="fontStyleWrap" class="keyboard__slash-block">
173173
<button class="keyboard__slash-item" data-type="style2">
174174
<span class="keyboard__slash-text" style="-webkit-text-stroke: 0.2px var(--b3-theme-on-background);-webkit-text-fill-color : transparent;">${window.siyuan.languages.hollow}</span>
175175
</button>
@@ -182,7 +182,7 @@ export const renderTextMenu = (protyle: IProtyle, toolbarElement: Element) => {
182182
</button>
183183
</div>
184184
<div data-id="fontSize" class="keyboard__slash-title${disableFont ? " fn__none" : ""}">${window.siyuan.languages.fontSize}</div>
185-
<div class="keyboard__slash-block${disableFont ? " fn__none" : ""}">
185+
<div data-id="fontSizeWrap" class="keyboard__slash-block${disableFont ? " fn__none" : ""}">
186186
<select class="b3-select fn__block" style="width: calc(50% - 8px);margin: 4px 0 8px 0;">
187187
<option ${fontSize === "12px" ? "selected" : ""} value="12px">12px</option>
188188
<option ${fontSize === "13px" ? "selected" : ""} value="13px">13px</option>

app/src/protyle/toolbar/Font.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const appearanceMenu = (protyle: IProtyle, nodeElements?: Element[]) => {
6464
<kbd class="fn__kbd fn__flex-center${window.siyuan.config.keymap.editor.insert.lastUsed.custom ? "" : " fn__none"}">${updateHotkeyTip(window.siyuan.config.keymap.editor.insert.lastUsed.custom)}</kbd>
6565
</div>
6666
<div class="fn__hr--small"></div>
67-
<div class="fn__flex fn__flex-wrap" style="align-items: center">`;
67+
<div data-id="lastUsedWrap" class="fn__flex fn__flex-wrap" style="align-items: center">`;
6868
lastFonts.forEach((item: string) => {
6969
const lastFontStatus = item.split(Constants.ZWSP);
7070
switch (lastFontStatus[0]) {
@@ -112,7 +112,7 @@ export const appearanceMenu = (protyle: IProtyle, nodeElements?: Element[]) => {
112112
<div class="fn__hr"></div>
113113
<div data-id="color">${window.siyuan.languages.color}</div>
114114
<div class="fn__hr--small"></div>
115-
<div class="fn__flex fn__flex-wrap">
115+
<div data-id="colorWrap" class="fn__flex fn__flex-wrap">
116116
<button class="color__square ariaLabel" data-position="3south" data-type="style1" aria-label="${window.siyuan.languages.default}">A</button>
117117
<button class="color__square" data-type="style1" style="color: var(--b3-card-error-color);background-color: var(--b3-card-error-background);">A</button>
118118
<button class="color__square" data-type="style1" style="color: var(--b3-card-warning-color);background-color: var(--b3-card-warning-background);">A</button>
@@ -122,19 +122,19 @@ export const appearanceMenu = (protyle: IProtyle, nodeElements?: Element[]) => {
122122
<div class="fn__hr"></div>
123123
<div data-id="colorFont">${window.siyuan.languages.colorFont}</div>
124124
<div class="fn__hr--small"></div>
125-
<div class="fn__flex fn__flex-wrap">
125+
<div data-id="colorFontWrap" class="fn__flex fn__flex-wrap">
126126
${colorHTML}
127127
</div>
128128
<div class="fn__hr"></div>
129129
<div data-id="colorPrimary">${window.siyuan.languages.colorPrimary}</div>
130130
<div class="fn__hr--small"></div>
131-
<div class="fn__flex fn__flex-wrap">
131+
<div data-id="colorPrimaryWrap" class="fn__flex fn__flex-wrap">
132132
${bgHTML}
133133
</div>
134134
<div class="fn__hr"></div>
135135
<div data-id="fontStyle">${window.siyuan.languages.fontStyle}</div>
136136
<div class="fn__hr--small"></div>
137-
<div class="fn__flex">
137+
<div data-id="fontStyleWrap" class="fn__flex">
138138
<button data-type="style2" class="protyle-font__style" style="-webkit-text-stroke: 0.2px var(--b3-theme-on-background);-webkit-text-fill-color : transparent;">${window.siyuan.languages.hollow}</button>
139139
<button data-type="style4" class="protyle-font__style" style="text-shadow: 1px 1px var(--b3-theme-surface-lighter), 2px 2px var(--b3-theme-surface-lighter), 3px 3px var(--b3-theme-surface-lighter), 4px 4px var(--b3-theme-surface-lighter)">${window.siyuan.languages.shadow}</button>
140140
</div>
@@ -149,7 +149,7 @@ export const appearanceMenu = (protyle: IProtyle, nodeElements?: Element[]) => {
149149
<span class="fn__space--small"></span>
150150
</label>
151151
</div>
152-
<div class="${disableFont ? " fn__none" : ""}">
152+
<div data-id="fontSizeWrap" class="${disableFont ? " fn__none" : ""}">
153153
<div class="fn__hr"></div>
154154
<div class="b3-tooltips b3-tooltips__n fn__flex${fontSize.endsWith("em") ? " fn__none" : ""}" aria-label="${fontSize}">
155155
<input class="b3-slider fn__block" id="fontSizePX" max="72" min="9" step="1" type="range" value="${parseInt(fontSize)}">

0 commit comments

Comments
 (0)