Skip to content
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.

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

Revert "Addon-docs: Add opt-in table of contents" #23333

Merged
merged 1 commit into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 0 additions & 22 deletions code/addons/docs/template/stories/toc/basic.stories.ts

This file was deleted.

14 changes: 0 additions & 14 deletions code/addons/docs/template/stories/toc/custom-selector.stories.ts

This file was deleted.

14 changes: 0 additions & 14 deletions code/addons/docs/template/stories/toc/custom-title.stories.ts

This file was deleted.

14 changes: 0 additions & 14 deletions code/addons/docs/template/stories/toc/ignore-selector.stories.ts

This file was deleted.

1 change: 1 addition & 0 deletions code/builders/builder-manager/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({
}
});
router.use(`/index.html`, ({ path }, res) => {
console.log({ path });
res.status(200).send(html);
});

Expand Down
1 change: 0 additions & 1 deletion code/ui/.storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ export const parameters = {
},
docs: {
theme: themes.light,
toc: {},
},
controls: {
presetColors: [
Expand Down
1 change: 0 additions & 1 deletion code/ui/blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"polished": "^4.2.2",
"react-colorful": "^5.1.2",
"telejson": "^7.0.3",
"tocbot": "^4.20.1",
"ts-dedent": "^2.0.0",
"util-deprecate": "^1.0.2"
},
Expand Down
17 changes: 1 addition & 16 deletions code/ui/blocks/src/blocks/DocsContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import type { DocsContextProps } from './DocsContext';
import { DocsContext } from './DocsContext';
import { SourceContainer } from './SourceContainer';
import { scrollToElement } from './utils';
import { TableOfContents } from '../components/TableOfContents';

const { document, window: globalWindow } = global;

Expand All @@ -23,16 +22,6 @@ export const DocsContainer: FC<PropsWithChildren<DocsContainerProps>> = ({
theme,
children,
}) => {
let toc;

try {
const meta = context.resolveOf('meta', ['meta']);
toc = meta.preparedMeta.parameters?.docs?.toc;
} catch (err) {
// No meta, falling back to project annotations
toc = context?.projectAnnotations?.parameters?.docs?.toc;
}

useEffect(() => {
let url;
try {
Expand All @@ -55,11 +44,7 @@ export const DocsContainer: FC<PropsWithChildren<DocsContainerProps>> = ({
<DocsContext.Provider value={context}>
<SourceContainer channel={context.channel}>
<ThemeProvider theme={ensureTheme(theme)}>
<DocsPageWrapper
toc={toc ? <TableOfContents className="sbdocs sbdocs-toc--custom" {...toc} /> : null}
>
{children}
</DocsPageWrapper>
<DocsPageWrapper>{children}</DocsPageWrapper>
</ThemeProvider>
</SourceContainer>
</DocsContext.Provider>
Expand Down
11 changes: 4 additions & 7 deletions code/ui/blocks/src/components/DocsPage.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { FC } from 'react';
import React from 'react';
import { transparentize } from 'polished';
import { withReset } from '@storybook/components';
import type { CSSObject } from '@storybook/theming';
import { styled } from '@storybook/theming';
import { transparentize } from 'polished';
import type { FC } from 'react';
import React from 'react';

/**
* This selector styles all raw elements inside the DocsPage like this example with a `<div/>`:
Expand Down Expand Up @@ -429,19 +429,16 @@ export const DocsWrapper = styled.div(({ theme }) => ({
padding: '4rem 20px',
minHeight: '100vh',
boxSizing: 'border-box',
gap: '3rem',

[`@media (min-width: ${breakpoint}px)`]: {},
}));

interface DocsPageWrapperProps {
children?: React.ReactNode;
toc?: React.ReactNode;
}

export const DocsPageWrapper: FC<DocsPageWrapperProps> = ({ children, toc }) => (
export const DocsPageWrapper: FC<DocsPageWrapperProps> = ({ children }) => (
<DocsWrapper className="sbdocs sbdocs-wrapper">
<DocsContent className="sbdocs sbdocs-content">{children}</DocsContent>
{toc}
</DocsWrapper>
);
181 changes: 0 additions & 181 deletions code/ui/blocks/src/components/TableOfContents.tsx

This file was deleted.

8 changes: 0 additions & 8 deletions code/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5802,7 +5802,6 @@ __metadata:
polished: ^4.2.2
react-colorful: ^5.1.2
telejson: ^7.0.3
tocbot: ^4.20.1
ts-dedent: ^2.0.0
util-deprecate: ^1.0.2
peerDependencies:
Expand Down Expand Up @@ -29219,13 +29218,6 @@ __metadata:
languageName: node
linkType: hard

"tocbot@npm:^4.20.1":
version: 4.21.0
resolution: "tocbot@npm:4.21.0"
checksum: 877d99df40c07ec5e5c2259b820be9c8af9a9f52d582a61b7bed3d43daff820f23031bc613a5cc3bb14ecc34b79c1a45349dcbae8f3a79de7ecc127f366ed3c6
languageName: node
linkType: hard

"toggle-selection@npm:^1.0.6":
version: 1.0.6
resolution: "toggle-selection@npm:1.0.6"
Expand Down