Skip to content

Commit

Permalink
Merge branch 'development' into DSD-1740/close-dropdown-multiselect
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviawongnyc committed Jun 24, 2024
2 parents 1178b00 + 75340ac commit 262a5b1
Show file tree
Hide file tree
Showing 109 changed files with 4,449 additions and 6,851 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ jobs:
# the tag will match the package.json version (eg. v1.0.0)
- name: Tag
id: autotagger
uses: butlerlogic/action-autotag@stable
with:
uses: butlerlogic/action-autotag@1.1.2
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
with:
strategy: package
tag_prefix: v

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ dist
.eslintcache
coverage
.idea
.jest-test-results.json
2 changes: 1 addition & 1 deletion .jest-test-results.json

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { mergeConfig } from "vite";

const config: StorybookConfig = {
addons: [
"storybook-addon-designs",
"@storybook/addon-a11y",
"@storybook/addon-designs",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
Expand Down Expand Up @@ -51,6 +51,7 @@ const config: StorybookConfig = {
// Type-check stories during Storybook build.
check: true,
// Display the compiled value options.
reactDocgen: "react-docgen-typescript",
reactDocgenTypescriptOptions: {
// Do we want to display Chakra props in Storybook? Nope.
// They are useful but it clutters the Storybook file and the Chakra
Expand All @@ -69,6 +70,7 @@ const config: StorybookConfig = {
async viteFinal(config, { configType }) {
return mergeConfig(config, {
// Customize the Vite config here:
assetsInclude: ["/sb-preview/runtime.js"],
resolve: {
alias: {
// This is to get @storybook/addon-jest working:
Expand All @@ -77,10 +79,6 @@ const config: StorybookConfig = {
},
});
},

// docs: {
// autodocs: true,
// },
};

export default config;
29 changes: 17 additions & 12 deletions .storybook/preview-body.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,38 @@

<style>
/* Custom heading styles */
.sbdocs h1.storybook-heading:not(.innerZoomElementWrapper h1) {
.sbdocs h1:not(.chakra-heading) {
font-family: var(--nypl-fonts-heading);
font-size: 54px;
font-weight: 200;
letter-spacing: 1px;
line-height: 1.05;
margin-bottom: 2rem;
}
.sbdocs h2.storybook-heading:not(.innerZoomElementWrapper h2) {
.sbdocs h2:not(.chakra-heading) {
font-family: var(--nypl-fonts-heading);
font-size: 24px;
font-weight: 400;
font-weight: 500;
}
.sbdocs h3.storybook-heading:not(.innerZoomElementWrapper h3) {
.sbdocs h3:not(.chakra-heading) {
font-family: var(--nypl-fonts-heading);
font-size: 20px;
font-weight: 400;
font-weight: 600;
}
.sbdocs h4.storybook-heading:not(.innerZoomElementWrapper h4) {
.sbdocs h4:not(.chakra-heading) {
font-family: var(--nypl-fonts-heading);
font-size: 16px;
font-weight: 500;
font-weight: 700;
}
.sbdocs h5.storybook-heading:not(.innerZoomElementWrapper h5) {
.sbdocs h5:not(.chakra-heading) {
font-family: var(--nypl-fonts-heading);
font-size: 14px;
font-weight: 500;
font-weight: 700;
}
.sbdocs h6.storybook-heading:not(.innerZoomElementWrapper h6) {
.sbdocs h6:not(.chakra-heading) {
font-family: var(--nypl-fonts-heading);
font-size: 12px;
font-weight: 500;
font-weight: 700;
}
/* Custom link styles */
.sbdocs a:not(.innerZoomElementWrapper a) {
Expand Down Expand Up @@ -65,7 +71,6 @@
}
*/
.sbdocs :where(div:not(.sb-anchor, .sb-unstyled, .sb-unstyled div)) {
color: inherit;
font-family: inherit;
font-size: inherit;
}
Expand Down
22 changes: 1 addition & 21 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ import { DocsContainer } from "@storybook/blocks";
import type { Preview } from "@storybook/react";
import React, { useEffect } from "react";

import { DSProvider, Link, List, Text, useColorMode } from "../src/index";
import { DSProvider, List, Text, useColorMode } from "../src/index";
import nyplTheme from "../src/theme";
import results from "../.jest-test-results.json";
import { StorybookHeading } from "./storybookComponents";

// Custom viewport options
const customViewports = {
Expand Down Expand Up @@ -58,25 +57,6 @@ const customViewports = {
const MyDocsContainer = (props) => (
<MDXProvider
components={{
h1: ({ children }) => (
<StorybookHeading level="one">{children}</StorybookHeading>
),
h2: ({ children }) => (
<StorybookHeading level="two">{children}</StorybookHeading>
),
h3: ({ children }) => (
<StorybookHeading level="three">{children}</StorybookHeading>
),
h4: ({ children }) => (
<StorybookHeading level="four">{children}</StorybookHeading>
),
h5: ({ children }) => (
<StorybookHeading level="five">{children}</StorybookHeading>
),
h6: ({ children }) => (
<StorybookHeading level="six">{children}</StorybookHeading>
),
a: Link as any,
p: Text as any,
// TODO: Make this monospacing font
code: ({ children }) => <code>{children}</code>,
Expand Down
64 changes: 0 additions & 64 deletions .storybook/storybookComponents.tsx

This file was deleted.

47 changes: 46 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,46 @@ Currently, this repo is in Prerelease. When it is released, this project will ad

### Adds

- Adds `showRowDividers` prop to show/hide row dividers for the `List` `"dl"` variant.
- Adds Storybook interaction tests for `CheckboxGroup`, `DatePicker`, and `Slider` components.

### Updates

- Updates base font stack to only `system-ui` and `sans-serif`.

## 3.1.6 (June 20, 2024)

### Adds

- Adds Storybook interaction tests for `Searchbar`, `Select`, and `Radiogroup` components.

### Updates

- Updates how links are styled within the `Heading` component.

### Fixes

- Fixes broken Github Action for release tags.

## 3.1.5 (June 6, 2024)

### Adds

- Adds the following npm packages: `jest-transformer-svg`, `@storybook/addon-designs`, and `@storybook/test`.
- Adds Storybook interaction tests for `Select`.
- Adds Storybook interaction tests for `RadioGroup`.

### Updates

- Updates the following packages:
- Storybook main package and related libraries to `8.0.8`.
- `remark-gfm` to `4.0.0`.
- `vite` to `5.2.8`, `@vitejs/plugin-react` to `4.2.1`, and `vite-plugin-svgr` to `4.2.0`.
- Updates how SVGs are imported into `LogoSvgs.tsx` and `IconSvgs.tsx`.
- Updates Storybook internal link and heading styles and enables the hash heading URL linking.

### Removals

- Removes the following packages: `downshift`, `tough-cookie`, `@storybook/testing-library`, `storybook-addon-designs`, and `@svgr/webpack`.

### Updates

Expand All @@ -19,6 +58,12 @@ Currently, this repo is in Prerelease. When it is released, this project will ad
- Updates the `TextInput` and `SearchBar` components to better associate the input element to the entire component's helper text.
- Updates `Accordion` to close panel when element within panel is focused and "esc" key is pressed.

## 3.1.4 (May 23, 2024)

### Adds

- Adds `showRowDividers` prop to show/hide row dividers for the `List` `"dl"` variant.

### Fixes

- Fixes the z-index issue in the `MultiSelect` component's selected item button.
Expand Down
Loading

0 comments on commit 262a5b1

Please sign in to comment.