Skip to content

Commit d63fb5b

Browse files
committed
fix auto mode client side first time dark cookie set
1 parent d669feb commit d63fb5b

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"npmClient": "yarn",
33
"useWorkspaces": true,
4-
"version": "2.2.0"
4+
"version": "2.2.1"
55
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"publish:release": "lerna publish --tag-version-prefix=\"\" --force-publish=* --no-push --no-git-tag-version",
3535
"start": "yarn build:quick && lerna run start --parallel"
3636
},
37-
"version": "2.2.0",
37+
"version": "2.2.1",
3838
"workspaces": [
3939
"packages/*"
4040
]

packages/next-dark-mode-example/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"dependencies": {
77
"next": "^9.3.5",
8-
"next-dark-mode": "^2.2.0",
8+
"next-dark-mode": "^2.2.1",
99
"react": "^16.13.1",
1010
"react-dom": "^16.13.1"
1111
},
@@ -29,5 +29,5 @@
2929
"serve": "next start",
3030
"start": "next"
3131
},
32-
"version": "2.2.0"
32+
"version": "2.2.1"
3333
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import App from 'next/app'
2-
import withDarkMode from 'next-dark-mode'
2+
import withDarkMode, { MODE } from 'next-dark-mode'
33

44
import '../styles/global.css'
55

6-
export default withDarkMode(App)
6+
export default withDarkMode(App, { defaultMode: MODE.DARK })

packages/next-dark-mode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@
4343
},
4444
"source": "src/index.tsx",
4545
"types": "es6/index.d.ts",
46-
"version": "2.2.0"
46+
"version": "2.2.1"
4747
}

packages/next-dark-mode/src/index.tsx

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,31 @@ export default (App: NextComponentType | any, config?: Partial<Config>) => {
5656
if (state.autoModeSupported) {
5757
setCookie(null, darkModeCookieName, '1', {})
5858
return { ...state, browserMode: MODE.DARK, darkModeActive: true }
59-
} else return { ...state, autoModeSupported: true, browserMode: MODE.DARK }
59+
} else {
60+
if (state.autoModeActive) setCookie(null, darkModeCookieName, '1', {})
61+
return {
62+
...state,
63+
autoModeSupported: true,
64+
browserMode: MODE.DARK,
65+
darkModeActive: state.autoModeActive ? true : state.darkModeActive,
66+
}
67+
}
6068
})
6169
break
6270
case themes.LIGHT:
6371
setState(state => {
6472
if (state.autoModeSupported) {
6573
setCookie(null, darkModeCookieName, '0', {})
6674
return { ...state, browserMode: MODE.LIGHT, darkModeActive: false }
67-
} else return { ...state, autoModeSupported: true, browserMode: MODE.LIGHT }
75+
} else {
76+
if (state.autoModeActive) setCookie(null, darkModeCookieName, '0', {})
77+
return {
78+
...state,
79+
autoModeSupported: true,
80+
browserMode: MODE.LIGHT,
81+
darkModeActive: state.autoModeActive ? false : state.darkModeActive,
82+
}
83+
}
6884
})
6985
break
7086
case themes.NO_PREF:
@@ -113,4 +129,4 @@ export default (App: NextComponentType | any, config?: Partial<Config>) => {
113129
return DarkMode
114130
}
115131

116-
export { useDarkMode }
132+
export { MODE, useDarkMode }

0 commit comments

Comments
 (0)