Skip to content

Commit

Permalink
Merge branch 'next' into core/change-prettier-cmd
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnajdova
mnajdova committed Mar 26, 2024
2 parents da04d41 + 49bd994 commit 3fd5c91
Show file tree
Hide file tree
Showing 7 changed files with 462 additions and 228 deletions.
93 changes: 93 additions & 0 deletions apps/pigment-css-next-app/src/app/material-ui/react-chip/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
'use client';
import * as React from 'react';
import AvatarChips from '../../../../../../docs/data/material/components/chips/AvatarChips';
import BasicChips from '../../../../../../docs/data/material/components/chips/BasicChips';
import ChipsArray from '../../../../../../docs/data/material/components/chips/ChipsArray';
import ClickableAndDeletableChips from '../../../../../../docs/data/material/components/chips/ClickableAndDeletableChips';
import ClickableChips from '../../../../../../docs/data/material/components/chips/ClickableChips';
import ClickableLinkChips from '../../../../../../docs/data/material/components/chips/ClickableLinkChips';
import ColorChips from '../../../../../../docs/data/material/components/chips/ColorChips';
import CustomDeleteIconChips from '../../../../../../docs/data/material/components/chips/CustomDeleteIconChips';
import DeletableChips from '../../../../../../docs/data/material/components/chips/DeletableChips';
import IconChips from '../../../../../../docs/data/material/components/chips/IconChips';
import MultilineChips from '../../../../../../docs/data/material/components/chips/MultilineChips';
import SizesChips from '../../../../../../docs/data/material/components/chips/SizesChips';

export default function Chips() {
return (
<React.Fragment>
<section>
<h2> Avatar Chips</h2>
<div className="demo-container">
<AvatarChips />
</div>
</section>
<section>
<h2> Basic Chips</h2>
<div className="demo-container">
<BasicChips />
</div>
</section>
<section>
<h2> Chips Array</h2>
<div className="demo-container">
<ChipsArray />
</div>
</section>
<section>
<h2> Clickable And Deletable Chips</h2>
<div className="demo-container">
<ClickableAndDeletableChips />
</div>
</section>
<section>
<h2> Clickable Chips</h2>
<div className="demo-container">
<ClickableChips />
</div>
</section>
<section>
<h2> Clickable Link Chips</h2>
<div className="demo-container">
<ClickableLinkChips />
</div>
</section>
<section>
<h2> Color Chips</h2>
<div className="demo-container">
<ColorChips />
</div>
</section>
<section>
<h2> Custom Delete Icon Chips</h2>
<div className="demo-container">
<CustomDeleteIconChips />
</div>
</section>
<section>
<h2> Deletable Chips</h2>
<div className="demo-container">
<DeletableChips />
</div>
</section>
<section>
<h2> Icon Chips</h2>
<div className="demo-container">
<IconChips />
</div>
</section>
<section>
<h2> Multiline Chips</h2>
<div className="demo-container">
<MultilineChips />
</div>
</section>
<section>
<h2> Sizes Chips</h2>
<div className="demo-container">
<SizesChips />
</div>
</section>
</React.Fragment>
);
}
94 changes: 94 additions & 0 deletions apps/pigment-css-vite-app/src/pages/material-ui/react-chip.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import * as React from 'react';
import MaterialUILayout from '../../Layout';
import AvatarChips from '../../../../../docs/data/material/components/chips/AvatarChips.tsx';
import BasicChips from '../../../../../docs/data/material/components/chips/BasicChips.tsx';
import ChipsArray from '../../../../../docs/data/material/components/chips/ChipsArray.tsx';
import ClickableAndDeletableChips from '../../../../../docs/data/material/components/chips/ClickableAndDeletableChips.tsx';
import ClickableChips from '../../../../../docs/data/material/components/chips/ClickableChips.tsx';
import ClickableLinkChips from '../../../../../docs/data/material/components/chips/ClickableLinkChips.tsx';
import ColorChips from '../../../../../docs/data/material/components/chips/ColorChips.tsx';
import CustomDeleteIconChips from '../../../../../docs/data/material/components/chips/CustomDeleteIconChips.tsx';
import DeletableChips from '../../../../../docs/data/material/components/chips/DeletableChips.tsx';
import IconChips from '../../../../../docs/data/material/components/chips/IconChips.tsx';
import MultilineChips from '../../../../../docs/data/material/components/chips/MultilineChips.tsx';
import SizesChips from '../../../../../docs/data/material/components/chips/SizesChips.tsx';

export default function Chips() {
return (
<MaterialUILayout>
<h1>Chips</h1>
<section>
<h2> Avatar Chips</h2>
<div className="demo-container">
<AvatarChips />
</div>
</section>
<section>
<h2> Basic Chips</h2>
<div className="demo-container">
<BasicChips />
</div>
</section>
<section>
<h2> Chips Array</h2>
<div className="demo-container">
<ChipsArray />
</div>
</section>
<section>
<h2> Clickable And Deletable Chips</h2>
<div className="demo-container">
<ClickableAndDeletableChips />
</div>
</section>
<section>
<h2> Clickable Chips</h2>
<div className="demo-container">
<ClickableChips />
</div>
</section>
<section>
<h2> Clickable Link Chips</h2>
<div className="demo-container">
<ClickableLinkChips />
</div>
</section>
<section>
<h2> Color Chips</h2>
<div className="demo-container">
<ColorChips />
</div>
</section>
<section>
<h2> Custom Delete Icon Chips</h2>
<div className="demo-container">
<CustomDeleteIconChips />
</div>
</section>
<section>
<h2> Deletable Chips</h2>
<div className="demo-container">
<DeletableChips />
</div>
</section>
<section>
<h2> Icon Chips</h2>
<div className="demo-container">
<IconChips />
</div>
</section>
<section>
<h2> Multiline Chips</h2>
<div className="demo-container">
<MultilineChips />
</div>
</section>
<section>
<h2> Sizes Chips</h2>
<div className="demo-container">
<SizesChips />
</div>
</section>
</MaterialUILayout>
);
}
2 changes: 1 addition & 1 deletion packages/mui-icons-material/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"yargs": "^17.7.2"
},
"peerDependencies": {
"@mui/material": "^5.0.0",
"@mui/material": "workspace:^",
"@types/react": "^17.0.0 || ^18.0.0",
"react": "^17.0.0 || ^18.0.0"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-lab/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"prop-types": "^15.8.1"
},
"devDependencies": {
"@mui/material": "workspace:*",
"@mui-internal/test-utils": "workspace:^",
"@types/chai": "^4.3.12",
"@types/prop-types": "^15.7.11",
Expand All @@ -64,7 +65,7 @@
"peerDependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/material": ">=5.15.0",
"@mui/material": "workspace:^",
"@types/react": "^17.0.0 || ^18.0.0",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material-nextjs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"peerDependencies": {
"@emotion/cache": "^11.11.0",
"@emotion/server": "^11.11.0",
"@mui/material": "^5.0.0",
"@mui/material": "workspace:^",
"@types/react": "^17.0.0 || ^18.0.0",
"next": "^13.0.0 || ^14.0.0",
"react": "^17.0.0 || ^18.0.0"
Expand Down
Loading

0 comments on commit 3fd5c91

Please sign in to comment.