diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-a11y.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-a11y.stories.storyshot
index 878bc98efa77..37f01abf82a0 100644
--- a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-a11y.stories.storyshot
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-a11y.stories.storyshot
@@ -27,3 +27,31 @@ exports[`Storyshots Addon a11y Label 1`] = `
Testing the a11y addon
`;
+
+exports[`Storyshots Addons|a11y Default 1`] = `
+
+`;
+
+exports[`Storyshots Addons|a11y Disabled 1`] = `
+
+`;
+
+exports[`Storyshots Addons|a11y Invalid contrast 1`] = `
+
+`;
+
+exports[`Storyshots Addons|a11y Label 1`] = `
+
+`;
diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
index c9e4412cb647..cddeca338c91 100644
--- a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
@@ -39,3 +39,43 @@ exports[`Storyshots Addon Actions Reserved keyword as name 1`] = `
Delete
`;
+
+exports[`Storyshots Addons|Actions Circular Payload 1`] = `
+
+`;
+
+exports[`Storyshots Addons|Actions Decorated Action 1`] = `
+
+`;
+
+exports[`Storyshots Addons|Actions Function Name 1`] = `
+
+`;
+
+exports[`Storyshots Addons|Actions Hello World 1`] = `
+
+`;
+
+exports[`Storyshots Addons|Actions Reserved keyword as name 1`] = `
+
+`;
diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-backgrounds.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-backgrounds.stories.storyshot
index 47cb40abe1be..a486a9d6af7d 100644
--- a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-backgrounds.stories.storyshot
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-backgrounds.stories.storyshot
@@ -19,3 +19,23 @@ exports[`Storyshots Addon Backgrounds story 2 1`] = `
`;
+
+exports[`Storyshots Addons|Backgrounds story 1 1`] = `
+
+
+
+`;
+
+exports[`Storyshots Addons|Backgrounds story 2 1`] = `
+
+
+
+`;
diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
index c161f17376d2..840a27fe8c72 100644
--- a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
@@ -3879,3 +3879,3593 @@ exports[`Storyshots Addon Info.React Docgen Comments from component declaration
`;
+
+exports[`Storyshots Addons|Info.GitHub issues #1814 1`] = `
+
+
+
+
+
+
+
+
+
+ Addons|Info.GitHub issues
+
+
+ #1814
+
+
+
+
+ Allow Duplicate DisplayNames for HOC #1814
+
+
+
+
+ Story Source
+
+
+
+
+
+ <div
+
+
+
+
+
+ >
+
+
+
+
+ <Unknown
+
+
+
+
+
+ />
+
+
+
+
+ <Unknown
+
+
+
+
+
+ />
+
+
+
+
+ </div>
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "" Component
+
+
+ No propTypes defined!
+
+
+
+
+ "" Component
+
+
+ No propTypes defined!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Markdown
+
+
+ Displays Markdown in description
+
+
+
+
+ You can use markdown in your withInfo() description.
+
+
+ Sometimes you might want to manually include some code examples:
+
+
+
+ const codeblock = [];
+
+
+
+ Maybe include a
+
+ link
+
+ to your project as well.
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ onClick
+
+
+ =
+
+
+ {
+
+ clicked()
+
+ }
+
+
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Options.TableComponent
+
+
+ Use a custom component for the table
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ name
+ |
+
+ type
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+ |
+
+ false
+ |
+
+
+ |
+
+
+ |
+ label
+
+ *
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+ |
+
+ {}
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Info Addon header should be hidden
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Options.inline
+
+
+ Inlines component inside story
+
+
+
+
+
+
+
+
+
+
+
+ Component should be inlined between description and PropType table
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Options.propTables
+
+
+ Shows additional component prop tables
+
+
+
+
+ There should be a prop table added for a component not included in the story
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+ "FlowTypeButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+ unknown
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+ unknown
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Options.propTablesExclude
+
+
+ Exclude component from prop tables
+
+
+
+
+ This can exclude extraneous components from being displayed in prop tables.
+
+
+
+
+ Story Source
+
+
+
+
+
+ <div
+
+
+
+
+
+ >
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+ <FlowTypeButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Flow Typed Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+ </div>
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Options.source
+
+
+ Shows or hides Info Addon source
+
+
+
+
+ The Info Addon source section should be hidden
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.Options.styles
+
+
+ Change info styles // I think this is broken or I am using it wrong?
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.React Docgen
+
+
+ Comments from Flow declarations
+
+
+
+
+ Comments above the Flow declarations should be extracted from the React component file itself and rendered in the Info Addon prop table
+
+
+
+
+ Story Source
+
+
+
+
+ <FlowTypeButton
+
+
+
+
+
+ onClick
+
+
+ =
+
+
+ {
+
+ clicked()
+
+ }
+
+
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Flow Typed Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "FlowTypeButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+ unknown
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+ unknown
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.React Docgen
+
+
+ Comments from PropType declarations
+
+
+
+
+ Comments above the PropType declarations should be extracted from the React component file itself and rendered in the Info Addon prop table
+
+
+
+
+ Story Source
+
+
+
+
+ <DocgenButton
+
+
+
+
+
+ onClick
+
+
+ =
+
+
+ {
+
+ clicked()
+
+ }
+
+
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Docgen Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "DocgenButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ one
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ two
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ obj
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ shape
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ arrayOf
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ msg
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ enm
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ union
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+ -
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Addons|Info.React Docgen
+
+
+ Comments from component declaration
+
+
+
+
+ Comments above the component declaration should be extracted from the React component file itself and rendered below the Info Addon heading
+
+
+
+
+ Story Source
+
+
+
+
+ <BaseButton
+
+
+
+
+
+ onClick
+
+
+ =
+
+
+ {
+
+ clicked()
+
+ }
+
+
+
+
+
+
+
+ label
+
+
+ =
+
+
+ "Button"
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+ Prop Types
+
+
+
+ "BaseButton" Component
+
+
+
+
+ |
+ property
+ |
+
+ propType
+ |
+
+ required
+ |
+
+ default
+ |
+
+ description
+ |
+
+
+
+
+ |
+ disabled
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ false
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ label
+ |
+
+
+
+
+ |
+
+ yes
+ |
+
+ -
+ |
+
+
+ |
+
+
+ |
+ onClick
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ onClick()
+
+ }
+
+ |
+
+
+ |
+
+
+ |
+ style
+ |
+
+
+
+
+ |
+
+ -
+ |
+
+
+ {
+
+ {}
+
+ }
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+ Hit the knob load button and it should trigger an async load after a short delay
+
+
+ No items loaded
+
+
+
+ My name is Storyteller, I'm 70 years old, and my favorite fruit is apple.
+
+
+ My birthday is: January 20, 2017
+
+
+ I live in NY for 9 years.
+
+
+ My wallet contains: $12.50
+
+
+ In my backpack, I have:
+
+
+ -
+ Laptop
+
+ -
+ Book
+
+ -
+ Whiskey
+
+
+
+ Nice to meet you!
+
+
+
+
+
+ PS. My shirt pocket contains:
+
+
+
+ Hit the knob load button and it should trigger an async load after a short delay
+
+
+ No items loaded
+
+
+
+ If you are encountering performance issues with state updating too often, use withKnobsOptions to debounce changes.
+
+
+ My name is Storyteller, I'm 70 years old, and my favorite fruit is apple.
+
+
+ My birthday is: January 20, 2017
+
+
+ My wallet contains: $12.50
+
+
+ In my backpack, I have:
+
+
+ -
+ Laptop
+
+ -
+ Book
+
+ -
+ Whiskey
+
+
+
+ Nice to meet you!
+
+
+
+
+
+ PS. My shirt pocket contains:
+
+