feat(input_dark_mode): Consult document element for color mode first (#…

…1119) * feat(input_dark_mode): Consult document element for color mode first Co-authored-by: Carson Sievert <[email protected]>
rstudio · Oct 1, 2024 · e862e0b · e862e0b
1 parent 7ff88a1
commit e862e0b
Show file tree

Hide file tree

Showing 46 changed files with 65 additions and 41 deletions.
diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/inst/components/dist/components.js b/inst/components/dist/components.js
diff --git a/inst/components/dist/components.min.js b/inst/components/dist/components.min.js
diff --git a/inst/components/dist/web-components.js b/inst/components/dist/web-components.js
diff --git a/inst/components/dist/web-components.js.map b/inst/components/dist/web-components.js.map
diff --git a/inst/components/dist/web-components.min.js b/inst/components/dist/web-components.min.js
diff --git a/inst/components/dist/web-components.min.js.map b/inst/components/dist/web-components.min.js.map
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fBBc4.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fBBc4.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fBxc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fBxc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fCBc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fCBc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fCRc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fCRc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmEU9fCxc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmEU9fCxc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fBBc4.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfABc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfABc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfBBc4.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfBBc4.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfBxc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfBxc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfCBc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfCBc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfCRc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfCRc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfChc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfChc4EsA.woff2
diff --git a/inst/fonts/KFOlCnqEu92Fr1MmWUlfCxc4EsA.woff2 b/inst/fonts/KFOlCnqEu92Fr1MmWUlfCxc4EsA.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu4mxK.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu4mxK.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2
diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2 b/inst/fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2
diff --git a/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2 b/inst/fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2
diff --git a/inst/lib/bsw5/dist/zephyr/font.css b/inst/lib/bsw5/dist/zephyr/font.css
@@ -4,7 +4,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2JL7SUc.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -13,7 +13,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa0ZL7SUc.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -22,7 +22,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2ZL7SUc.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -31,7 +31,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1pL7SUc.woff2) format('woff2');
   unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* vietnamese */
@@ -40,7 +40,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2pL7SUc.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -49,7 +49,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa25L7SUc.woff2) format('woff2');
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -58,7 +58,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1ZL7.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
@@ -67,7 +67,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2JL7SUc.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -76,7 +76,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa0ZL7SUc.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -85,7 +85,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2ZL7SUc.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -94,7 +94,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1pL7SUc.woff2) format('woff2');
   unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* vietnamese */
@@ -103,7 +103,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2pL7SUc.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -112,7 +112,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa25L7SUc.woff2) format('woff2');
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -121,7 +121,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1ZL7.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
@@ -130,7 +130,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2JL7SUc.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -139,7 +139,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa0ZL7SUc.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -148,7 +148,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2ZL7SUc.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -157,7 +157,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1pL7SUc.woff2) format('woff2');
   unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* vietnamese */
@@ -166,7 +166,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa2pL7SUc.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -175,7 +175,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa25L7SUc.woff2) format('woff2');
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -184,6 +184,6 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url(fonts/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2) format('woff2');
+  src: url(fonts/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1ZL7.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
diff --git a/man/navset.Rd b/man/navset.Rd
diff --git a/man/page_navbar.Rd b/man/page_navbar.Rd
diff --git a/srcts/src/components/webcomponents/inputDarkMode.ts b/srcts/src/components/webcomponents/inputDarkMode.ts
@@ -223,9 +223,18 @@ export class BslibInputDarkMode extends LitElement {
     this.attribute = this.getAttribute("attribute") || this.attribute;
 
     if (typeof this.mode === "undefined") {
-      this.mode = window.matchMedia("(prefers-color-scheme: dark)").matches
-        ? "dark"
-        : "light";
+      // If the switch doesn't have a preference about color mode, first consult
+      // the data attribute on `<html>` followed by OS/browser preferences
+      const fromDom = document.documentElement.getAttribute(this.attribute);
+      if (fromDom === "dark") {
+        this.mode = "dark";
+      } else if (fromDom === "light") {
+        this.mode == "light";
+      } else {
+        this.mode = window.matchMedia("(prefers-color-scheme: dark)").matches
+          ? "dark"
+          : "light";
+      }
     }
 
     this.reflectPreference();