Skip to content

Next #262

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.

Sign up for GitHub

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
valentinpalkovic merged 14 commits into from
Apr 16, 2025
Merged

Next #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
29cd50d
upgrade to sb9-alpha
ndelangen Feb 27, 2025
93d28f8
cleanup
ndelangen Feb 27, 2025
628a98b
remove @storybook/manager-api
ndelangen Feb 27, 2025
1499c1a
fix linting
ndelangen Feb 27, 2025
ef0d28e
Refactor imports to use updated paths for Storybook components and th…
ndelangen Mar 14, 2025
c6a12a9
Update package-lock.json and package.json to include new dependencies…
ndelangen Mar 17, 2025
30e7b2d
Merge pull request #257 from storybookjs/norbert/sb9-upgrade
ndelangen Mar 17, 2025
4af1b12
Refactor Image and ZoomButtons components for improved layout and ico…
valentinpalkovic Mar 26, 2025
92b49d0
Merge pull request #258 from storybookjs/valentin/remove-deprecated-i…
valentinpalkovic Mar 26, 2025
d648766
Update package-lock.json and package.json to change "dev" to "devOpti…
ndelangen Apr 2, 2025
a17111c
Merge pull request #260 from storybookjs/norbert/add-peerdep-blocks
ndelangen Apr 2, 2025
a45b930
Refactor imports to use `@storybook/addon-docs` instead of `@storyboo…
ndelangen Apr 14, 2025
a49b556
Update package-lock.json to reflect new versions and licenses for var…
ndelangen Apr 14, 2025
1537098
Merge pull request #261 from storybookjs/norbert/blocks-fix
ndelangen Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'category: feature'
assignees: ''

title: ""
labels: "category: feature"
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
19,274 changes: 7,158 additions & 12,116 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/examples/.storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import remarkGfm from "remark-gfm";
import type { StorybookConfig } from "@storybook/types";
import type { StorybookConfig } from "@storybook/react-webpack5";

const isTabMode = process.env.STORYBOOK_ADDON_DESIGNS_MODE === "tab";

Expand Down
4 changes: 2 additions & 2 deletions packages/examples/.storybook/manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// import "../types.d.ts";
import { addons } from "@storybook/manager-api";
import { create } from "@storybook/theming";
import { addons } from "storybook/manager-api";
import { create } from "storybook/theming";

import logo from "../assets/logo-with-text.svg";
import pkg from "@storybook/addon-designs/package.json";
Expand Down
15 changes: 5 additions & 10 deletions packages/examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@
"version": "8.0.0",
"private": true,
"devDependencies": {
"@storybook/addon-actions": "8.0.0",
"@storybook/addon-designs": "*",
"@storybook/addon-docs": "8.0.0",
"@storybook/addon-links": "8.0.0",
"@storybook/addon-storysource": "8.0.0",
"@storybook/addon-docs": "^9.0.0-alpha.10",
"@storybook/addon-links": "^9.0.0-alpha.10",
"@storybook/addon-webpack5-compiler-swc": "^1.0.2",
"@storybook/blocks": "8.0.0",
"@storybook/components": "8.0.0",
"@storybook/react": "8.0.0",
"@storybook/react-webpack5": "8.0.0",
"@storybook/theming": "8.0.0",
"@storybook/react": "^9.0.0-alpha.10",
"@storybook/react-webpack5": "^9.0.0-alpha.10",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"remark-gfm": "^4.0.0",
"storybook": "8.0.0"
"storybook": "^9.0.0-alpha.10"
},
"scripts": {
"storybook": "storybook dev -p 6006",
Expand Down
19 changes: 11 additions & 8 deletions packages/examples/stories/Button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@
border: none 0;
outline: 0;

font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
color: #fff;
background-image: linear-gradient(277.88deg, #51b441 32.37%, #61c451 99.3%);
text-transform: uppercase;
border-radius: 4px;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.15);
cursor: pointer;

transition: transform 0.1s ease, box-shadow 0.1s ease;
transition:
transform 0.1s ease,
box-shadow 0.1s ease;
}

.button:active {
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25);
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25);

transform: scale(0.99);
transform: scale(0.99);
}

.button:disabled {
background-image: linear-gradient(277.88deg, #a6b4a4 32.37%, #bdc4bc 99.3%);
color: #e0e0e0;
cursor: not-allowed;
background-image: linear-gradient(277.88deg, #a6b4a4 32.37%, #bdc4bc 99.3%);
color: #e0e0e0;
cursor: not-allowed;
}
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/0.quickStart.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from "@storybook/blocks";
import { TabsState } from "@storybook/components";
import { Meta } from "@storybook/addon-docs/blocks";
import { TabsState } from "storybook/internal/components";

<Meta title="Docs/Quick start" />

Expand Down
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/advanced/docs.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta, Subtitle } from "@storybook/blocks";
import { TabsState } from "@storybook/components";
import { Meta, Subtitle } from "@storybook/addon-docs/blocks";
import { TabsState } from "storybook/internal/components";

import { Figma } from "@storybook/addon-designs/blocks";

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/docs/advanced/hide-tab.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas, Subtitle } from "@storybook/blocks";
import { Meta, Story, Canvas, Subtitle } from "@storybook/addon-docs/blocks";
import { hideTab } from "./index.stories";
import { PanelName } from "@storybook/addon-designs";

Expand Down
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/figma/README.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from "@storybook/blocks";
import { Badge } from "@storybook/components";
import { Meta } from "@storybook/addon-docs/blocks";
import { Badge } from "storybook/internal/components";

<Meta title="Docs/Figma/README" />

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/docs/figma/examples.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Subtitle } from "@storybook/blocks";
import { Meta, Subtitle } from "@storybook/addon-docs/blocks";
import * as FigmaStories from "./examples.stories";

<Meta of={FigmaStories} />
Expand Down
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/figspec/README.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from "@storybook/blocks";
import { Badge } from "@storybook/components";
import { Meta } from "@storybook/addon-docs/blocks";
import { Badge } from "storybook/internal/components";

<Meta title="Docs/Figma (Figspec)/README" />

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/docs/iframe/Docs.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Subtitle } from "@storybook/blocks";
import { Meta, Subtitle } from "@storybook/addon-docs/blocks";
import * as IFrameStories from "./index.stories";

<Meta of={IFrameStories} />
Expand Down
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/iframe/README.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from "@storybook/blocks";
import { Badge } from "@storybook/components";
import { Meta } from "@storybook/addon-docs/blocks";
import { Badge } from "storybook/internal/components";

<Meta title="Docs/iframe/README" />

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/docs/image/Docs.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Subtitle } from "@storybook/blocks";
import { Meta, Subtitle } from "@storybook/addon-docs/blocks";
import * as ImageStories from "./index.stories";

<Meta of={ImageStories} />
Expand Down
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/image/README.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from "@storybook/blocks";
import { Badge } from "@storybook/components";
import { Meta } from "@storybook/addon-docs/blocks";
import { Badge } from "storybook/internal/components";

<Meta title="Docs/Image/README" />

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/docs/link/Docs.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Subtitle } from "@storybook/blocks";
import { Meta, Subtitle } from "@storybook/addon-docs/blocks";
import * as LinkStories from "./index.stories";

<Meta of={LinkStories} />
Expand Down
4 changes: 2 additions & 2 deletions packages/examples/stories/docs/link/README.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from "@storybook/blocks";
import { Badge } from "@storybook/components";
import { Meta } from "@storybook/addon-docs/blocks";
import { Badge } from "storybook/internal/components";

<Meta title="Docs/Link/README" />

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/internal/blocks/0.common.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, ArgTypes, Source } from "@storybook/blocks";
import { Meta, ArgTypes, Source } from "@storybook/addon-docs/blocks";
import { DocBlockBase, IFrame } from "@storybook/addon-designs/blocks";

<Meta title="Internal/Blocks/Common" />
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/internal/blocks/1.design.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, ArgTypes, Source, Canvas } from "@storybook/blocks";
import { Meta, ArgTypes, Source, Canvas } from "@storybook/addon-docs/blocks";
import { Design } from "@storybook/addon-designs/blocks";
import * as $1DesignStories from "./1.design.stories";

Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/internal/blocks/figma-spec.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, ArgTypes } from "@storybook/blocks";
import { Meta, ArgTypes } from "@storybook/addon-docs/blocks";
import { Figspec } from "@storybook/addon-designs/blocks";

<Meta title="Internal/Blocks/Figspec" />
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/internal/blocks/figma.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, ArgTypes } from "@storybook/blocks";
import { Meta, ArgTypes } from "@storybook/addon-docs/blocks";
import { Figma } from "@storybook/addon-designs/blocks";

<Meta title="Internal/Blocks/Figma" />
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/internal/blocks/iframe.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, ArgTypes } from "@storybook/blocks";
import { Meta, ArgTypes } from "@storybook/addon-docs/blocks";
import { IFrame } from "@storybook/addon-designs/blocks";

<Meta title="Internal/Blocks/IFrame" />
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/stories/internal/blocks/image.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, ArgTypes } from "@storybook/blocks";
import { Meta, ArgTypes } from "@storybook/addon-docs/blocks";
import { Image } from "@storybook/addon-designs/blocks";
import sampleImage from "../../../assets/sample.png";

Expand Down
31 changes: 10 additions & 21 deletions packages/storybook-addon-designs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-designs",
"version": "8.0.0-alpha.1",
"version": "9.0.0-alpha.0",
"description": "Storybook addon for embedding your design preview in addon panel",
"keywords": [
"storybook-addon",
Expand Down Expand Up @@ -45,36 +45,25 @@
},
"devDependencies": {
"@auto-it/released": "^11.1.1",
"@storybook/components": "^8.0.0",
"@storybook/core-events": "^8.0.0",
"@storybook/manager-api": "^8.0.0",
"@storybook/preview-api": "^8.0.0",
"@storybook/theming": "^8.0.0",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@types/webpack-env": "^1.18.4",
"auto": "^11.1.1",
"figma-js": "^1.16.0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^18.0.0",
"tsup": "^8.0.2",
"typescript": "^5.4.2"
"storybook": "^9.0.0-alpha.5",
"typescript": "^5.7.3"
},
"peerDependencies": {
"@storybook/blocks": "^8.0.0 || ^8.1.0-0 || ^8.2.0-0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0",
"@storybook/components": "^8.0.0 || ^8.1.0-0 || ^8.2.0-0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0",
"@storybook/theming": "^8.0.0 || ^8.1.0-0 || ^8.2.0-0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
"@storybook/addon-docs": "^0.0.0-0 || ^9.0.0 || ^9.0.0-0",
"storybook": "^0.0.0-0 || ^9.0.0 || ^9.0.0-0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
},
"peerDependenciesMeta": {
"@storybook/blocks": {
"optional": true
},
"@storybook/components": {
"optional": true
},
"@storybook/theming": {
"@storybook/addon-docs": {
"optional": true
},
"react": {
Expand Down
8 changes: 4 additions & 4 deletions packages/storybook-addon-designs/src/blocks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState } from "react";
import type { CSSProperties, FC } from "react";
import { ActionBar, Placeholder } from "@storybook/components";
import { styled } from "@storybook/theming";
import { useOf, Of } from "@storybook/blocks";
import { ActionBar, Placeholder } from "storybook/internal/components";
import { styled } from "storybook/theming";
import { useOf, Of } from "@storybook/addon-docs/blocks";

import { Figma as FigmaInternal } from "./manager/components/Figma";
import { Figspec as FigspecInternal } from "./manager/components/Figspec";
Expand All @@ -13,7 +13,7 @@ import { Wrapper as WrapperInternal } from "./manager/components/Wrapper";
import * as config from "./config";
import { ParameterName } from "./constants";

// Since the exports of `@storybook/components` is unstable, I couldn't manage
// Since the exports of `storybook/internal/components` is unstable, I couldn't manage
// to import the `components.resetWrapper` while maintaining version requirements.
// This component does similar to the official one at minimum.
// https://github.com/storybookjs/storybook/blob/4bd2fc9b0677190c59e60fd63841294ab88e80c5/lib/components/src/typography/DocumentFormatting.tsx#L364-L372
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-addon-designs/src/manager/components/ErrorBoundary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @jsx jsx */
import { Component, ErrorInfo, Fragment } from "react";
import { Link, Placeholder } from "@storybook/components";
import { jsx } from "@storybook/theming";
import { Link, Placeholder } from "storybook/internal/components";
import { jsx } from "storybook/theming";

type State =
| {
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-addon-designs/src/manager/components/Figma.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @jsx jsx */
import { FC, useMemo } from "react";
import { jsx } from "@storybook/theming";
import { jsx } from "storybook/theming";

import { IFrame } from "./IFrame";

Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-addon-designs/src/manager/components/Figspec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import {
FigspecFrameViewer,
FigspecFrameViewerProps,
} from "@figspec/react";
import { Placeholder } from "@storybook/components";
import { css, jsx } from "@storybook/theming";
import { Placeholder } from "storybook/internal/components";
import { css, jsx } from "storybook/theming";

import { FigspecConfig } from "../../config";

Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-addon-designs/src/manager/components/IFrame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** @jsx jsx */
import { FC, ReactNode, useEffect, useState } from "react";
import { css, jsx } from "@storybook/theming";
import { css, jsx } from "storybook/theming";

import { Placeholder } from "@storybook/components";
import { Placeholder } from "storybook/internal/components";

import { IFrameConfigBase } from "../../config";

Expand Down
35 changes: 22 additions & 13 deletions packages/storybook-addon-designs/src/manager/components/Image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** @jsx jsx */
import { Fragment, useMemo, CSSProperties, FC } from "react";
import { css, jsx } from "@storybook/theming";
import { css, jsx } from "storybook/theming";

import { FlexBar, Separator } from "@storybook/components";
import { FlexBar, Separator } from "storybook/internal/components";

import { Pan } from "./Pan";
import { ZoomButtons } from "./ZoomButtons";
Expand All @@ -28,17 +28,26 @@ export const ImagePreview: FC<Props> = ({ config }) => {
return (
<div css={$container}>
<FlexBar border>
<Fragment key="left">
<p>
<b>Image</b>
</p>
<Separator />
<ZoomButtons
onReset={zoom.resetZoom}
onZoomIn={zoom.zoomIn}
onZoomOut={zoom.zoomOut}
/>
</Fragment>
<div
style={{
display: "grid",
gridAutoFlow: "column",
gap: "4px",
alignItems: "center",
}}
>
<Fragment key="left">
<p>
<b>Image</b>
</p>
<Separator />
<ZoomButtons
onReset={zoom.resetZoom}
onZoomIn={zoom.zoomIn}
onZoomOut={zoom.zoomOut}
/>
</Fragment>
</div>
</FlexBar>
<Pan css={$preview} defaultValue={config.offset}>
<img css={$image} src={config.url} style={imageStyles} />
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-addon-designs/src/manager/components/LinkPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** @jsx jsx */
import { FC } from "react";
import { css, jsx } from "@storybook/theming";
import { css, jsx } from "storybook/theming";

import { Link } from "@storybook/components";
import { Link } from "storybook/internal/components";

import { LinkConfig } from "../../config";

Expand Down
Loading