Skip to content

Commit

Permalink
feat: add example dir to mix and match
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewgallo committed Nov 15, 2024
1 parent e4ce0ff commit 26f53d6
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 60 deletions.
15 changes: 15 additions & 0 deletions react/mix-and-match/src/Example/Example.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Grid, Column } from '@carbon/react';
import { ResizableCols } from './ResizableCols';
import { LegacyGrid } from './LegacyGrid';
import './example.scss';

export const Example = () => (
<Grid className="page-grid">
<Column sm={4} md={8} lg={16}>
<ResizableCols />
</Column>
<Column sm={4} md={8} lg={16}>
<LegacyGrid />
</Column>
</Grid>
);
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ import {
ColumnResizeMode,
} from '@tanstack/react-table';
import { makeData } from './makeData';
import { ExampleLink } from './ExampleLink';
import { Launch } from '@carbon/react/icons';
import * as packageJson from '../package.json';

type Resource = {
id: string;
Expand Down Expand Up @@ -80,24 +77,6 @@ export const ResizableCols = () => {
<TableContainer
title="Resizable columns"
className="basic-table tanstack-example"
description={
<span className="flex">
<ExampleLink
url={`${import.meta.env.VITE_CODE_SANDBOX_URL_ROOT}/${
packageJson.name
}`}
icon={Launch}
label="Code sandbox"
/>
<ExampleLink
url={`${import.meta.env.VITE_STACK_BLITZ_URL_ROOT}/${
packageJson.name
}`}
icon={Launch}
label="StackBlitz"
/>
</span>
}
style={{
width: table.getCenterTotalSize(),
}}>
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions react/mix-and-match/src/Example/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Example } from './Example';
File renamed without changes.
9 changes: 0 additions & 9 deletions react/mix-and-match/src/ExampleLink.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions react/mix-and-match/src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,8 @@
);
@use '@carbon/styles/scss/type';
@use '@carbon/ibm-products/css/index';
@use './App';

body {
margin: 0;
padding: 0;
}

.example--link {
@include type.type-style('label-01');

display: flex;
align-items: center;
margin-right: 0.5rem;
}

.example--link__icon {
margin-right: 0.25rem;
}
3 changes: 0 additions & 3 deletions react/mix-and-match/src/index.ts

This file was deleted.

15 changes: 2 additions & 13 deletions react/mix-and-match/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import {
CodeSnippet,
Column,
Grid,
Header,
HeaderContainer,
HeaderName,
} from '@carbon/react';

import { ResizableCols } from './ResizableCols';

import './index.scss';
import { LegacyGrid } from './LegacyGrid';
import { Example } from './Example';

const renderUIShellHeader = () => (
<HeaderContainer
Expand All @@ -33,13 +29,6 @@ const renderUIShellHeader = () => (
createRoot(document.getElementById('root')!).render(
<StrictMode>
{renderUIShellHeader()}
<Grid className="page-grid">
<Column sm={4} md={8} lg={16}>
<ResizableCols />
</Column>
<Column sm={4} md={8} lg={16}>
<LegacyGrid />
</Column>
</Grid>
<Example />
</StrictMode>
);
2 changes: 1 addition & 1 deletion react/mix-and-match/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,

"types": [ "./src/customTypings.d.ts" ],
"types": ["./src/Example/customTypings.d.ts"],
"resolveJsonModule": true
},
"include": ["./src"]
Expand Down

0 comments on commit 26f53d6

Please sign in to comment.