-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ☝️How to write a good PR title: - Prefix it with [ComponentName] (if applicable), for example: [Button] - Start with a verb, for example: Add, Delete, Improve, Fix… - Give as much context as necessary and as little as possible - Prefix it with [WIP] while it’s a work in progress --> ### WHY are these changes introduced? Fixes #10146 <!-- link to issue if one exists --> <img width="2032" alt="Screenshot 2023-09-11 at 4 16 37 PM" src="https://github.com/Shopify/polaris/assets/4642404/f4f7865b-4d01-47ea-87b4-efc38d7c0585"> <!-- Context about the problem that’s being addressed. --> ### WHAT is this pull request doing? Migrating the `<!-- colors -->` directive from `makdown.mjs` to MDX renderer <!-- Summary of the changes committed. Before / after screenshots are appreciated for UI changes. Make sure to include alt text that describes the screenshot. If you include an animated gif showing your change, wrapping it in a details tag is recommended. Gifs usually autoplay, which can cause accessibility issues for people reviewing your PR: <details> <summary>Summary of your gif(s)</summary> <img src="..." alt="Description of what the gif shows"> </details> --> <!-- ℹ️ Delete the following for small / trivial changes --> ### How to 🎩 1. `yarn run dev` 2. navigate to [`/design/colors`](http://localhost:3000/design/colors) 3. The color palette should load on the page.⚠️ The `<h3>` styling of the color titles doesn't currently match what's on prod. We'll fix this in a bigger sweep of styling regressions in a future PR 🖥 [Local development instructions](https://github.com/Shopify/polaris/blob/main/README.md#local-development) 🗒 [General tophatting guidelines](https://github.com/Shopify/polaris/blob/main/documentation/Tophatting.md) 📄 [Changelog guidelines](https://github.com/Shopify/polaris/blob/main/.github/CONTRIBUTING.md#changelog) <!-- Give as much information as needed to experiment with the component in the playground. --> <details> <summary>Copy-paste this code in <code>playground/Playground.tsx</code>:</summary> ```jsx import React from 'react'; import {Page} from '../src'; export function Playground() { return ( <Page title="Playground"> {/* Add the code you want to test in here */} </Page> ); } ``` </details> ### 🎩 checklist - [ ] Tested on [mobile](https://github.com/Shopify/polaris/blob/main/documentation/Tophatting.md#cross-browser-testing) - [ ] Tested on [multiple browsers](https://help.shopify.com/en/manual/shopify-admin/supported-browsers) - [ ] Tested for [accessibility](https://github.com/Shopify/polaris/blob/main/documentation/Accessibility%20testing.md) - [ ] Updated the component's `README.md` with documentation changes - [ ] [Tophatted documentation](https://github.com/Shopify/polaris/blob/main/documentation/Tophatting%20documentation.md) changes in the style guide --------- Co-authored-by: Jess Telford <jess.telford@shopify.com>
- Loading branch information
1 parent
58b0ea4
commit f186b19
Showing
7 changed files
with
89 additions
and
70 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
27 changes: 27 additions & 0 deletions
27
polaris.shopify.com/src/components/Markdown/components/Colors/Colors.module.scss
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,27 @@ | ||
@import '../../../../styles/variables.scss'; | ||
|
||
.Colors { | ||
display: grid; | ||
grid-template-columns: repeat(5, 1fr); | ||
gap: var(--p-space-4); | ||
margin-bottom: var(--p-space-8); | ||
font-size: var(--font-size-75); | ||
font-weight: var(--p-font-weight-semibold); | ||
|
||
@media (min-width: $breakpointTablet) { | ||
grid-template-columns: repeat(10, 1fr); | ||
} | ||
|
||
.ColorsSwatch { | ||
position: relative; | ||
overflow: hidden; | ||
border-radius: var(--p-border-radius-2); | ||
margin-bottom: var(--p-space-2); | ||
|
||
&:before { | ||
content: ''; | ||
display: block; | ||
padding-bottom: 75%; | ||
} | ||
} | ||
} |
54 changes: 54 additions & 0 deletions
54
polaris.shopify.com/src/components/Markdown/components/Colors/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,54 @@ | ||
import * as colorsObj from '../../../../../../polaris-tokens/dist/esm/src/colors.mjs'; | ||
import {capitalize} from '../../../../utils/various'; | ||
import styles from './Colors.module.scss'; | ||
|
||
type ColorScale = 50 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900; | ||
|
||
type ColorValue = { | ||
[index in ColorScale]: string; | ||
}; | ||
|
||
interface Colors { | ||
[key: string]: ColorValue; | ||
} | ||
|
||
const colors = colorsObj as unknown as Colors; | ||
|
||
export function Colors() { | ||
const colorOrder = [ | ||
'gray', | ||
'green', | ||
'teal', | ||
'blue', | ||
'purple', | ||
'red', | ||
'orange', | ||
'yellow', | ||
]; | ||
|
||
const colorMap = colorOrder.map((color) => { | ||
const shades: ColorValue = colors[color] ?? []; | ||
const swatches = Object.entries(shades) | ||
.sort(([prevShade], [nextShade]) => | ||
Number(prevShade) < Number(nextShade) ? 1 : -1, | ||
) | ||
.map(([shade, value]) => ( | ||
<div key={value}> | ||
<div | ||
className={styles.ColorsSwatch} | ||
style={{backgroundColor: value}} | ||
></div> | ||
<div>{shade}</div> | ||
</div> | ||
)); | ||
|
||
return ( | ||
<> | ||
<h3>{capitalize(color)}</h3> | ||
<div className={styles.Colors}>{swatches}</div> | ||
</> | ||
); | ||
}); | ||
|
||
return <>{colorMap}</>; | ||
} |
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