Skip to content

Commit 017a83f

Browse files
authored
Fixes/sidebar extension state by clearing and active autocompletion box background (#1466)
* fix: clear filter state from sidebar extension tab * fix: theme autocompletion active line background
1 parent 481e747 commit 017a83f

File tree

4 files changed

+71
-72
lines changed

4 files changed

+71
-72
lines changed

config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
3838
<application android:networkSecurityConfig="@xml/network_security_config" />
3939
<application android:hardwareAccelerated="true" />
40-
<application android:requestLegacyExternalStorage="true" />
4140
<application android:largeHeap="true" />
4241
<application android:requestLegacyExternalStorage="true"/>
4342
</edit-config>

package-lock.json

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/sidebarApps/extensions/index.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,12 @@ function ListItem({ icon, name, id, version, downloads, installed, source }) {
564564
if (searchInput) {
565565
searchInput.value = "";
566566
$searchResult.content = "";
567+
// Reset filter state when clearing search results
568+
currentFilter = null;
569+
filterCurrentPage = 1;
570+
filterHasMore = true;
571+
isFilterLoading = false;
572+
$searchResult.onscroll = null;
567573
updateHeight($searchResult);
568574
$installed.expand();
569575
}
@@ -650,6 +656,12 @@ async function uninstall(id) {
650656
if (searchInput) {
651657
searchInput.value = "";
652658
$searchResult.content = "";
659+
// Reset filter state when clearing search results
660+
currentFilter = null;
661+
filterCurrentPage = 1;
662+
filterHasMore = true;
663+
isFilterLoading = false;
664+
$searchResult.onscroll = null;
653665
updateHeight($searchResult);
654666
if ($installed.collapsed) {
655667
$installed.expand();

src/styles/overrideAceStyle.scss

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,59 @@
1-
.ace_mobile-menu,
2-
.ace_tooltip.ace_doc-tooltip {
3-
display: none !important;
4-
}
5-
6-
.ace_editor {
7-
&[data-font="Fira Code"] {
8-
font-feature-settings: 'liga' on, 'calt' on;
9-
-webkit-font-feature-settings: 'liga' on, 'calt' on;
10-
-webkit-font-smoothing: antialiased;
11-
text-rendering: optimizeLegibility;
12-
unicode-bidi: isolate;
13-
}
14-
}
15-
16-
.ace_tooltip {
17-
background-color: rgb(255, 255, 255);
18-
background-color: var(--secondary-color);
19-
color: rgb(37, 37, 37);
20-
color: var(--secondary-text-color);
21-
max-width: 68%;
22-
white-space: pre-wrap;
23-
}
24-
25-
main .ace_editor {
26-
textarea {
27-
user-select: none !important;
28-
pointer-events: none !important;
29-
transform: translate(-100000px, -10000px) !important;
30-
}
31-
}
32-
33-
.ace-container {
34-
height: 100%;
35-
}
36-
37-
.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
38-
background-color: var(--active-color);
39-
}
40-
41-
.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight {
42-
color: var(--popup-active-color);
43-
}
44-
45-
.ace_dark.ace_editor.ace_autocomplete {
46-
border: 1px solid var(--popup-border-color);
47-
box-shadow: 2px 3px 5px var(--box-shadow-color);
48-
line-height: 1.4;
49-
background: var(--primary-color);
50-
color: var(--primary-text-color);
51-
}
52-
53-
.ace_hidden-cursors .ace_cursor {
54-
opacity: 0.8 !important;
55-
}
1+
.ace_mobile-menu,
2+
.ace_tooltip.ace_doc-tooltip {
3+
display: none !important;
4+
}
5+
6+
.ace_editor {
7+
&[data-font="Fira Code"] {
8+
font-feature-settings:
9+
"liga" on,
10+
"calt" on;
11+
-webkit-font-feature-settings:
12+
"liga" on,
13+
"calt" on;
14+
-webkit-font-smoothing: antialiased;
15+
text-rendering: optimizeLegibility;
16+
unicode-bidi: isolate;
17+
}
18+
}
19+
20+
.ace_tooltip {
21+
background-color: rgb(255, 255, 255);
22+
background-color: var(--secondary-color);
23+
color: rgb(37, 37, 37);
24+
color: var(--secondary-text-color);
25+
max-width: 68%;
26+
white-space: pre-wrap;
27+
}
28+
29+
main .ace_editor {
30+
textarea {
31+
user-select: none !important;
32+
pointer-events: none !important;
33+
transform: translate(-100000px, -10000px) !important;
34+
}
35+
}
36+
37+
.ace-container {
38+
height: 100%;
39+
}
40+
41+
.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
42+
background-color: rgba(from var(--active-color) r g b / 0.3);
43+
}
44+
45+
.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight {
46+
color: var(--popup-active-color);
47+
}
48+
49+
.ace_dark.ace_editor.ace_autocomplete {
50+
border: 1px solid var(--popup-border-color);
51+
box-shadow: 2px 3px 5px var(--box-shadow-color);
52+
line-height: 1.4;
53+
background: var(--primary-color);
54+
color: var(--primary-text-color);
55+
}
56+
57+
.ace_hidden-cursors .ace_cursor {
58+
opacity: 0.8 !important;
59+
}

0 commit comments

Comments
 (0)