Skip to content

Commit

Permalink
Merge branch 'aa/dt-1891' into aa/dt-1891-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
bapmrl committed Jan 29, 2024
2 parents 127b6e4 + aef2769 commit c4705c8
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/adapter-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-next",
"version": "0.3.33",
"version": "0.3.34",
"description": "Slice Machine adapter for Next.js.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-nuxt",
"version": "0.3.33",
"version": "0.3.34",
"description": "Slice Machine adapter for Nuxt 3.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-nuxt2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-nuxt2",
"version": "0.3.33",
"version": "0.3.34",
"description": "Slice Machine adapter for Nuxt 2.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-sveltekit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-sveltekit",
"version": "0.3.33",
"version": "0.3.34",
"description": "Slice Machine adapter for SvelteKit.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/init/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/init",
"version": "2.9.11",
"version": "2.9.12",
"description": "Init Prismic Slice Machine in your project",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/manager",
"version": "0.17.7",
"version": "0.17.8",
"description": "Manage all aspects of a Slice Machine project.",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/plugin-kit",
"version": "0.4.33",
"version": "0.4.34",
"description": "A set of helpers to develop and run Slice Machine plugins",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/slice-machine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "slice-machine-ui",
"version": "1.23.0",
"version": "1.23.1",
"license": "MIT",
"description": "A visual builder for your Slice Models with all the tools you need to generate data models and mock CMS content locally.",
"repository": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import {
Button,
ButtonGroup,
IconButton,
Select,
SelectItem,
Skeleton,
Text,
tokens,
Expand Down Expand Up @@ -105,7 +107,9 @@ export const LoadingWithHeaderAndList = {
children: (
<>
<FieldSetLegend>Connected Git Repository</FieldSetLegend>
<FieldSetHeader />
<FieldSetHeader>
<OwnerSelect disabled />
</FieldSetHeader>
<FieldSetList>
{[...Array(4).keys()].map((index) => (
<FieldSetListItem
Expand Down Expand Up @@ -137,7 +141,9 @@ export const WithHeaderAndListOverflow = {
children: (
<>
<FieldSetLegend>Connected Git Repository</FieldSetLegend>
<FieldSetHeader />
<FieldSetHeader>
<OwnerSelect />
</FieldSetHeader>
<FieldSetList>
{[...Array(100).keys()].map((index) => (
<FieldSetListItem
Expand Down Expand Up @@ -177,12 +183,15 @@ export const WithSingleListItem = {
parameters: { controls: { hideNoControlsWarning: true, include: [] } },
};

export const WithBoxContent = {
export const WithHeaderAndBoxContent = {
args: {
...Default.args,
children: (
<>
<FieldSetLegend>Connected Git Repository</FieldSetLegend>
<FieldSetHeader>
<OwnerSelect />
</FieldSetHeader>
<FieldSetContent>
{/*
* TODO: these `padding` values actually don't match Figma, but they
Expand All @@ -206,3 +215,27 @@ export const WithBoxContent = {
},
parameters: { controls: { hideNoControlsWarning: true, include: [] } },
};

type OwnerSelectProps = { disabled?: boolean };

function OwnerSelect(props: OwnerSelectProps) {
return (
<Select
{...props}
color="grey"
constrainContentWidth
flexContent
placeholder="Owner"
renderStartIcon={() => <GitHubIcon color={tokens.color.greyLight11} />}
size="large"
sx={{ width: "calc(50% - 8px)" }}
>
<SelectItem size="large" value="owner-1">
Owner
</SelectItem>
<SelectItem size="large" value="owner-2">
Owner
</SelectItem>
</Select>
);
}
2 changes: 1 addition & 1 deletion packages/start-slicemachine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "start-slicemachine",
"version": "0.12.13",
"version": "0.12.14",
"description": "Start Slice Machine from within a project.",
"repository": {
"type": "git",
Expand Down

0 comments on commit c4705c8

Please sign in to comment.