Revert "chore: revert change"

This reverts commit 6eeac57.
umijs · Dec 15, 2023 · fee192f · fee192f
1 parent 6eeac57
commit fee192f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/client/theme-api/usePrefersColor.ts b/src/client/theme-api/usePrefersColor.ts
@@ -86,15 +86,15 @@ class ColorChanger {
    * listen color change
    * @param cb  callback
    */
-  listen(cb: (typeof this.callbacks)[number]) {
+  listen(cb: typeof this.callbacks[number]) {
     this.callbacks.push(cb);
   }
 
   /**
    * unlisten color change
    * @param cb  callback
    */
-  unlisten(cb: (typeof this.callbacks)[number]) {
+  unlisten(cb: typeof this.callbacks[number]) {
     this.callbacks.splice(this.callbacks.indexOf(cb), 1);
   }
 
@@ -137,7 +137,7 @@ export const usePrefersColor = () => {
   useEffect(() => {
     // lazy initialize, for SSR
     colorChanger ??= new ColorChanger({
-      default: themeConfig.prefersColor.default,
+      default: themeConfig.prefersColor?.default ?? 'auto',
     });
     colorChanger.listen(colorChangeHandler);
     setColor(colorChanger.color);

diff --git a/src/client/theme-default/slots/Content/index.less b/src/client/theme-default/slots/Content/index.less
@@ -206,4 +206,12 @@
       margin-bottom: 24px;
     }
   }
+
+  &[data-no-sidebar][data-no-footer] {
+    margin-bottom: @s-content-padding;
+
+    @media @mobile {
+      margin-bottom: 24px;
+    }
+  }
 }
diff --git a/src/client/theme-default/slots/Header/index.tsx b/src/client/theme-default/slots/Header/index.tsx
@@ -48,7 +48,7 @@ const Header: FC = () => {
             <SearchBar />
             <LangSwitch />
             <RtlSwitch />
-            {themeConfig.prefersColor.switch && <ColorSwitch />}
+            {themeConfig.prefersColor?.switch && <ColorSwitch />}
             {socialIcons.map((item) => (
               <SocialIcon icon={item.icon} link={item.link} key={item.link} />
             ))}