Skip to content

Commit

Permalink
Runs PR prep
Browse files Browse the repository at this point in the history
  • Loading branch information
AkimaLunar committed Dec 11, 2023
1 parent 737f0dc commit 24d94fa
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 30 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@
"@babel/preset-typescript": "^7.23.2",
"@griffel/react": "^1.5.18",
"@microsoft/arbutus.aside-navigation": "1.0.7",
"@microsoft/arbutus.bookmark-tile": "1.0.7",
"@microsoft/arbutus.bookmark-tile": "1.0.8",
"@microsoft/arbutus.code-snippet": "1.0.6",
"@microsoft/arbutus.command": "1.0.5",
"@microsoft/arbutus.command": "1.0.6",
"@microsoft/arbutus.divider": "1.0.4",
"@microsoft/arbutus.file-to-string": "1.0.4",
"@microsoft/arbutus.icon": "1.0.5",
"@microsoft/arbutus.icon-button": "1.0.7",
"@microsoft/arbutus.link": "1.1.5",
"@microsoft/arbutus.main-navigation": "1.0.6",
"@microsoft/arbutus.mark-list": "1.0.7",
"@microsoft/arbutus.recommendation-tile": "1.0.7",
"@microsoft/arbutus.icon": "1.0.6",
"@microsoft/arbutus.icon-button": "1.0.8",
"@microsoft/arbutus.link": "1.1.6",
"@microsoft/arbutus.main-navigation": "1.0.7",
"@microsoft/arbutus.mark-list": "1.0.8",
"@microsoft/arbutus.recommendation-tile": "1.0.8",
"@microsoft/arbutus.tabs": "1.0.7",
"@microsoft/arbutus.text": "1.0.6",
"@microsoft/arbutus.theme-switch": "1.0.5",
"@microsoft/arbutus.theme-switch": "1.0.6",
"@microsoft/arbutus.theming": "1.1.2",
"@microsoft/arbutus.tile": "1.0.6",
"@microsoft/arbutus.ts": "0.0.2",
Expand Down
2 changes: 1 addition & 1 deletion utilities/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@microsoft/arbutus.recommendation-tile": "1.0.8",
"@microsoft/arbutus.resource-chip": "0.0.2",
"@microsoft/arbutus.shell": "1.1.8",
"@microsoft/arbutus.table-list": "^1.1.5",
"@microsoft/arbutus.table-list": "1.1.5",
"@microsoft/arbutus.tabs": "1.0.7",
"@microsoft/arbutus.tag": "1.0.4",
"@microsoft/arbutus.text": "1.0.6",
Expand Down
10 changes: 9 additions & 1 deletion utilities/docs/src/code-examples/__raw__/button-basic.raw.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
export default `import * as React from 'react';
import { Button } from '@microsoft/arbutus.button';
const ExampleComponent = () => <Button onClick={() => { /** Action */}}>Click me!</Button>;
const ExampleComponent = () => (
<Button
onClick={() => {
/** Action */
}}
>
Click me!
</Button>
);
export default ExampleComponent;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ const ExampleComponent = () => {
<>
<div className={classes.root}>
<Button>Primary brick</Button>
<Button color='secondary'>Secondary brick</Button>
<Button color="secondary">Secondary brick</Button>
</div>
<div className={classes.root}>
<Button shape="pill" >Primary pill</Button>
<Button shape="pill" color='secondary'>Secondary pill</Button>
<Button shape="pill">Primary pill</Button>
<Button shape="pill" color="secondary">
Secondary pill
</Button>
</div>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { tokens } from '@fluentui/react-theme';
const containerStyles = makeStyles({
root: {
display: 'flex',
alignItems: 'center',
columnGap: tokens.spacingHorizontalM,
},
});
Expand All @@ -15,9 +16,15 @@ const ExampleComponent = () => {
return (
<div className={classes.root}>
<Button size="small">Small</Button>
<Button size="medium">Medium</Button>
<Button size="large">Large</Button>
<Button color="secondary" size="small">
Small
</Button>
<Button color="secondary" size="medium">
Medium
</Button>
<Button color="secondary" size="large">
Large
</Button>
</div>
);
};
Expand Down
10 changes: 9 additions & 1 deletion utilities/docs/src/code-examples/button-basic.example.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import * as React from 'react';
import { Button } from '@microsoft/arbutus.button';

const ExampleComponent = () => <Button onClick={() => { /** Action */}}>Click me!</Button>;
const ExampleComponent = () => (
<Button
onClick={() => {
/** Action */
}}
>
Click me!
</Button>
);

export default ExampleComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ const ExampleComponent = () => {
<>
<div className={classes.root}>
<Button>Primary brick</Button>
<Button color='secondary'>Secondary brick</Button>
<Button color="secondary">Secondary brick</Button>
</div>
<div className={classes.root}>
<Button shape="pill" >Primary pill</Button>
<Button shape="pill" color='secondary'>Secondary pill</Button>
<Button shape="pill">Primary pill</Button>
<Button shape="pill" color="secondary">
Secondary pill
</Button>
</div>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ const ExampleComponent = () => {

return (
<div className={classes.root}>
<Button color="secondary" size="small">Small</Button>
<Button color="secondary" size="medium">Medium</Button>
<Button color="secondary" size="large">Large</Button>
<Button color="secondary" size="small">
Small
</Button>
<Button color="secondary" size="medium">
Medium
</Button>
<Button color="secondary" size="large">
Large
</Button>
</div>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,13 @@ export type ComponentPreviewComponentData = {

export type TableListComponentData = {
contentComponentId: 'lists.table-list';
data: string[][],
data: string[][];
headers?: {
text: string;
}[];
variant?: 'default' | 'alternating' | 'borderless';
columnSizing?: (number | string)[];

}
};

export type ComponentRendererProps = {
content?: ComponentData[] | [];
Expand Down
2 changes: 1 addition & 1 deletion utilities/docs/src/components/markdown-renderer/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export type { MarkdownRendererProps } from './markdown-renderer.types';
export { MarkdownRenderer } from './markdown-renderer';
export { MarkdownRenderer } from './markdown-renderer';
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export type MarkdownRendererProps = {
markdown: string;
};
};
2 changes: 1 addition & 1 deletion utilities/docs/src/layouts/reference/reference.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const ReferenceLayout: FC<ReferenceLayoutProps> = ({
const { copy: copyPackageName, status } = useCopyToClipboard();
const handleCopyPackageName = () => copyPackageName(packageName ?? '');
const handleFigmaToolkitClick = () =>
window.open('https://www.figma.com/@microsoft', '_blank');
window.open(figmaLink, '_blank');

return (
<>
Expand Down

0 comments on commit 24d94fa

Please sign in to comment.