-
-
Notifications
You must be signed in to change notification settings - Fork 8.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin' into lex111/hide-sidebar-reduce…
…-motion
- Loading branch information
Showing
31 changed files
with
741 additions
and
2,175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
const advancedBasePreset = require('cssnano-preset-advanced'); | ||
const postCssCombineDuplicatedSelectors = require('postcss-combine-duplicated-selectors'); | ||
const postCssSortMediaQueries = require('postcss-sort-media-queries'); | ||
const postCssRemoveOverriddenCustomProperties = require('./src/remove-overridden-custom-properties'); | ||
|
||
const preset = advancedBasePreset({autoprefixer: {add: true}}); | ||
|
||
preset.plugins.unshift( | ||
[postCssCombineDuplicatedSelectors, {removeDuplicatedProperties: true}], | ||
[postCssSortMediaQueries], | ||
[postCssRemoveOverriddenCustomProperties], | ||
); | ||
|
||
module.exports = preset; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"name": "@docusaurus/cssnano-preset", | ||
"version": "2.0.0-alpha.66", | ||
"description": "Advanced cssnano preset for maximum optimization", | ||
"main": "index.js", | ||
"license": "MIT", | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/facebook/docusaurus.git", | ||
"directory": "packages/docusaurus-cssnano-preset" | ||
}, | ||
"dependencies": { | ||
"postcss": "^7.0.2", | ||
"postcss-combine-duplicated-selectors": "^9.1.0", | ||
"postcss-sort-media-queries": "^1.7.26", | ||
"cssnano-preset-advanced": "^4.0.7" | ||
}, | ||
"devDependencies": { | ||
"to-vfile": "^6.0.0" | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
...preset/src/remove-overridden-custom-properties/__tests__/__snapshots__/index.test.js.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`remove-overridden-custom-properties overridden custom properties should be removed 1`] = ` | ||
":root { | ||
--color-secondary: green; | ||
--color-primary: blue; | ||
--color-header: gray; | ||
} | ||
" | ||
`; | ||
|
||
exports[`remove-overridden-custom-properties overridden custom properties with \`!important\` rule should not be removed 1`] = ` | ||
":root { | ||
--color-primary: blue; | ||
--color-header: gray !important; | ||
--color-secondary: yellow !important; | ||
} | ||
" | ||
`; |
8 changes: 8 additions & 0 deletions
8
...nano-preset/src/remove-overridden-custom-properties/__tests__/fixtures/important_rule.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
:root { | ||
--color-primary: red; | ||
--color-secondary: green; | ||
--color-primary: blue; | ||
--color-header: gray !important; | ||
--color-header: black; | ||
--color-secondary: yellow !important; | ||
} |
7 changes: 7 additions & 0 deletions
7
...urus-cssnano-preset/src/remove-overridden-custom-properties/__tests__/fixtures/normal.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
:root { | ||
--color-primary: red; | ||
--color-primary: red; | ||
--color-secondary: green; | ||
--color-primary: blue; | ||
--color-header: gray; | ||
} |
33 changes: 33 additions & 0 deletions
33
...docusaurus-cssnano-preset/src/remove-overridden-custom-properties/__tests__/index.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
const path = require('path'); | ||
const vfile = require('to-vfile'); | ||
const postcss = require('postcss'); | ||
const postCssRemoveOverriddenCustomProperties = require('../index'); | ||
|
||
const processFixture = (name) => { | ||
const input = vfile.readSync( | ||
path.join(__dirname, 'fixtures', `${name}.css`), | ||
'utf8', | ||
); | ||
const output = postcss([postCssRemoveOverriddenCustomProperties]).process( | ||
input, | ||
); | ||
|
||
return output.css; | ||
}; | ||
|
||
describe('remove-overridden-custom-properties', () => { | ||
test('overridden custom properties should be removed', () => { | ||
expect(processFixture('normal')).toMatchSnapshot(); | ||
}); | ||
|
||
test('overridden custom properties with `!important` rule should not be removed', () => { | ||
expect(processFixture('important_rule')).toMatchSnapshot(); | ||
}); | ||
}); |
42 changes: 42 additions & 0 deletions
42
packages/docusaurus-cssnano-preset/src/remove-overridden-custom-properties/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
const postcss = require('postcss'); | ||
|
||
/* | ||
This PostCSS plugin will remove duplicate/same custom properties (which are actually overridden ones) **only** from `:root` selector. | ||
Depending on the presence of an `!important` rule in value of custom property, the following actions will happens: | ||
- If the same custom properties do **not** have an `!important` rule, then all of them will be removed except for the last one (which will actually be applied). | ||
- If the same custom properties have at least one `!important` rule, then only those properties that do not have this rule will be removed. | ||
*/ | ||
|
||
module.exports = postcss.plugin( | ||
'postcss-remove-overridden-custom-properties', | ||
() => { | ||
return (root) => { | ||
root.walkDecls((decl) => { | ||
if (decl.parent.selector !== ':root') { | ||
return; | ||
} | ||
|
||
const sameProperties = | ||
decl.parent.nodes.filter((n) => n.prop === decl.prop) || []; | ||
const hasImportantProperties = sameProperties.some((p) => | ||
p.hasOwnProperty('important'), | ||
); | ||
|
||
const overriddenProperties = hasImportantProperties | ||
? sameProperties.filter((p) => !p.hasOwnProperty('important')) | ||
: sameProperties.slice(0, -1); | ||
|
||
overriddenProperties.map((p) => p.remove()); | ||
}); | ||
}; | ||
}, | ||
); |
15 changes: 15 additions & 0 deletions
15
packages/docusaurus-theme-bootstrap/src/theme/ThemeContext.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
import React from 'react'; | ||
import type {ThemeContextProps} from '@theme/hooks/useThemeContext'; | ||
|
||
const ThemeContext = React.createContext<ThemeContextProps | undefined>( | ||
undefined, | ||
); | ||
|
||
export default ThemeContext; |
53 changes: 53 additions & 0 deletions
53
packages/docusaurus-theme-bootstrap/src/theme/ThemedImage/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
import React from 'react'; | ||
import clsx from 'clsx'; | ||
|
||
import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; | ||
import useThemeContext from '@theme/hooks/useThemeContext'; | ||
import type {Props} from '@theme/ThemedImage'; | ||
|
||
import styles from './styles.module.css'; | ||
|
||
const ThemedImage = (props: Props): JSX.Element => { | ||
const {isClient} = useDocusaurusContext(); | ||
const {isDarkTheme} = useThemeContext(); | ||
const {sources, className, alt = '', ...propsRest} = props; | ||
|
||
type SourceName = keyof Props['sources']; | ||
|
||
const renderedSourceNames: SourceName[] = isClient | ||
? isDarkTheme | ||
? ['dark'] | ||
: ['light'] | ||
: // We need to render both images on the server to avoid flash | ||
// See https://github.com/facebook/docusaurus/pull/3730 | ||
['light', 'dark']; | ||
|
||
return ( | ||
<> | ||
{renderedSourceNames.map((sourceName) => { | ||
return ( | ||
<img | ||
key={sourceName} | ||
src={sources[sourceName]} | ||
alt={alt} | ||
className={clsx( | ||
styles.themedImage, | ||
styles[`themedImage--${sourceName}`], | ||
className, | ||
)} | ||
{...propsRest} | ||
/> | ||
); | ||
})} | ||
</> | ||
); | ||
}; | ||
|
||
export default ThemedImage; |
11 changes: 11 additions & 0 deletions
11
packages/docusaurus-theme-bootstrap/src/theme/ThemedImage/styles.module.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
.themedImage { | ||
display: none; | ||
} | ||
|
||
html[data-theme='light'] .themedImage--light { | ||
display: block; | ||
} | ||
|
||
html[data-theme='dark'] .themedImage--dark { | ||
display: block; | ||
} |
19 changes: 19 additions & 0 deletions
19
packages/docusaurus-theme-bootstrap/src/theme/hooks/useThemeContext.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
import {useContext} from 'react'; | ||
|
||
import ThemeContext from '@theme/ThemeContext'; | ||
import type {ThemeContextProps} from '@theme/hooks/useThemeContext'; | ||
|
||
// TODO: Un-stub the theme context (#3730) | ||
function useThemeContext(): ThemeContextProps { | ||
const context = useContext<ThemeContextProps | undefined>(ThemeContext); | ||
return context == null ? {isDarkTheme: false} : context; | ||
} | ||
|
||
export default useThemeContext; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,6 @@ | |
display: block; | ||
position: relative; | ||
top: -0.5rem; | ||
outline: none; | ||
} | ||
|
||
.hash-link { | ||
|
Oops, something went wrong.