Skip to content

Commit e68850a

Browse files
committed
Merge remote-tracking branch 'origin/main' into codex/vue-migration-baseline-tracker
* origin/main: feat(S2): S2 ListView (adobe#8878) refactor: Centralize expandedKeys logic in TreeCollection (adobe#9711) chore: Warn if user has interactive elements in their custom Picker value (adobe#9710) feat: S2 unavailable menu item (adobe#9657) fix: Ensure that opening a submenu via enter/space moves focus to first item in submenu (adobe#9691) fix: prevent docs crash by making template elements always append children into .content (adobe#9703) docs(RAC): Add TreeSection docs (adobe#9699) docs(S2): add Typography search view (adobe#9524) docs(S2): fix clipping in Picker custom value AvatarGroup example (adobe#9702) fix: patch additional methods so React doesnt break with template elements (adobe#9385) tentative fix (adobe#9635) docs(S2): fix icon import clipboard content to add underscore for icons starting with number (adobe#9698) feat(S2): add ActionBar support to TreeView (adobe#9695) fix: combobox interactoutside (adobe#9646) fix: skip native Date fast path when local timezone is overridden via setLocalTimeZone (adobe#9678) chore: update storybook to 9 (adobe#8634) docs: improve custom render value S2 Picker example (adobe#9682) # Conflicts: # yarn.lock
2 parents 86d3256 + a9fccbd commit e68850a

File tree

272 files changed

+4663
-5439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+4663
-5439
lines changed

.chromatic-fc/custom-addons/chromatic/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {expressThemes, locales, S2ColorThemes, scales, themes} from '../../constants';
2-
import {makeDecorator} from '@storybook/preview-api';
2+
import {makeDecorator} from 'storybook/preview-api';
33
import {Provider, View} from '@adobe/react-spectrum';
44
import {Provider as S2Provider} from '@react-spectrum/s2';
55
import React, {useEffect} from 'react';

.chromatic-fc/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
'../packages/@react-spectrum/s2/chromatic/*.stories.@(js|jsx|mjs|ts|tsx)'
1010
],
1111
addons: process.env.NODE_ENV === 'production' ? [] : [
12-
'@storybook/addon-actions',
12+
'storybook/actions',
1313
'@storybook/addon-a11y'
1414
],
1515
typescript: {

.chromatic-fc/manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {addons} from '@storybook/manager-api';
1+
import {addons} from 'storybook/manager-api';
22

33
addons.setConfig({
44
enableShortcuts: false,

.chromatic-fc/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {configureActions} from '@storybook/addon-actions';
1+
import {configureActions} from 'storybook/actions';
22
import React from 'react';
33
import {VerticalCenter} from './layout';
44
import {withChromaticProvider} from './custom-addons/chromatic';

.chromatic/custom-addons/chromatic/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {expressThemes, locales, S2Backgrounds, S2ColorThemes, scales, themes} from '../../constants';
2-
import {makeDecorator} from '@storybook/preview-api';
2+
import {makeDecorator} from 'storybook/preview-api';
33
import {Provider, View} from '@adobe/react-spectrum';
44
import {Provider as S2Provider} from '@react-spectrum/s2';
55
import React, {useEffect} from 'react';

.chromatic/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
'../packages/@react-spectrum/s2/chromatic/*.stories.@(js|jsx|mjs|ts|tsx)'
1010
],
1111
addons: process.env.NODE_ENV === 'production' ? [] : [
12-
'@storybook/addon-actions',
12+
'storybook/actions',
1313
'@storybook/addon-a11y'
1414
],
1515
typescript: {

.chromatic/manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {addons} from '@storybook/manager-api';
1+
import {addons} from 'storybook/manager-api';
22

33
addons.setConfig({
44
enableShortcuts: false,

.chromatic/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {configureActions} from '@storybook/addon-actions';
1+
import {configureActions} from 'storybook/actions';
22
import React from 'react';
33
import {VerticalCenter} from './layout';
44
import {withChromaticProvider} from './custom-addons/chromatic';

.circleci/comment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async function run() {
4141
break;
4242
}
4343
}
44-
} else if (process.env.CIRCLE_BRANCH === 'main') {
44+
} else if (!process.env.CIRCLE_PULL_REQUEST) {
4545
// If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
4646
await octokit.repos.createCommitComment({
4747
owner: 'adobe',

.storybook-s2/custom-addons/provider/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, {useEffect, useState} from 'react';
2-
import {addons} from '@storybook/preview-api';
3-
import {makeDecorator} from '@storybook/preview-api';
2+
import {addons, makeDecorator} from 'storybook/preview-api';
43
// Importing from src so that HMR works.
54
// Without this, all HMR updates will bubble through the index.ts and up
65
// to the root instead of stopping at the story files.

0 commit comments

Comments
 (0)