-
Notifications
You must be signed in to change notification settings - Fork 551
refactor(styles): theme-adaptive shared code theme #8023
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
edcf4f0
feat(tokens): add code syntax colour tokens
talissoncosta c0035f9
refactor(styles): theme-adaptive shared code theme
talissoncosta 9e25723
refactor(components): add embedded prop, explicit Button import, getR…
talissoncosta 64027e3
test(storybook): add Highlight stories
talissoncosta 7a4c081
fix(styles): markup tag names use the title colour, not red
talissoncosta 904981b
test(storybook): add JSX Highlight story
talissoncosta dd347ec
fix(code-help): correct the React init snippet
talissoncosta a353029
fix(styles): only show the embedded code scrollbar on overflow
talissoncosta a1f42d2
fix(code-help): copy real brackets, not HTML entities
talissoncosta 049be79
refactor(styles): split the escaping change out to #8062
talissoncosta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,93 @@ | ||
| import type { Meta, StoryObj } from 'storybook' | ||
|
|
||
| import Highlight from 'components/Highlight' | ||
|
|
||
| const meta: Meta<typeof Highlight> = { | ||
| component: Highlight, | ||
| parameters: { | ||
| docs: { | ||
| description: { | ||
| component: | ||
| 'The code wrapper: renders a `<pre><code class="hljs">` block and runs ' + | ||
| 'highlight.js over it. This is what the shared code theme styles (surface, ' + | ||
| 'border, syntax palette). Toggle the theme in the toolbar to QA light vs dark; ' + | ||
| '`className` is the highlight.js language.', | ||
| }, | ||
| }, | ||
| layout: 'padded', | ||
| }, | ||
| title: 'Components/Highlight', | ||
| } | ||
|
|
||
| export default meta | ||
|
|
||
| type Story = StoryObj<typeof Highlight> | ||
|
|
||
| const js = `// Initialise the client | ||
| import flagsmith from 'flagsmith' | ||
|
|
||
| flagsmith.init({ | ||
| environmentID: 'YOUR_ENVIRONMENT_KEY', | ||
| onChange: () => { | ||
| const bannerSize = flagsmith.getValue('banner_size') | ||
| }, | ||
| })` | ||
|
|
||
| const ts = `import { useFlags } from 'flagsmith/react' | ||
|
|
||
| type FlagName = 'banner_size' | 'my_feature' | ||
|
|
||
| const flags = useFlags<FlagName>(['banner_size']) | ||
| const size: number = flags.banner_size.value ?? 0` | ||
|
|
||
| const json = `{ | ||
| "flags": [ | ||
| { "feature": "banner_size", "enabled": true, "value": 42 }, | ||
| { "feature": "my_feature", "enabled": false, "value": null } | ||
| ] | ||
| }` | ||
|
|
||
| const yaml = `flags: | ||
| - feature: banner_size | ||
| enabled: true | ||
| value: 42` | ||
|
|
||
| // Mirrors the React SDK snippet in code-help: markup tags inside JavaScript. | ||
| const jsx = `export function HomePage() { | ||
| const flags = useFlags(['banner_size']) | ||
| return ( | ||
| <Row className="banner"> | ||
| <Flag name="banner_size" size={flags.banner_size.value} /> | ||
| </Row> | ||
| ) | ||
| }` | ||
|
|
||
| export const JavaScript: Story = { | ||
| args: { children: js, className: 'javascript', forceExpanded: true }, | ||
| } | ||
|
|
||
| export const TypeScript: Story = { | ||
| args: { children: ts, className: 'typescript', forceExpanded: true }, | ||
| } | ||
|
|
||
| export const Json: Story = { | ||
| args: { children: json, className: 'json', forceExpanded: true }, | ||
| } | ||
|
|
||
| export const Yaml: Story = { | ||
| args: { children: yaml, className: 'yaml', forceExpanded: true }, | ||
| } | ||
|
|
||
| export const Jsx: Story = { | ||
| args: { children: jsx, className: 'javascript', forceExpanded: true }, | ||
| } | ||
|
|
||
| // Embedded variant: transparent, for code whose container owns the surface. | ||
| export const Embedded: Story = { | ||
| args: { | ||
| children: js, | ||
| className: 'javascript', | ||
| embedded: true, | ||
| forceExpanded: true, | ||
| }, | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.