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

Copy patterns and fieldsets #295

Merged
merged 7 commits into from
Aug 22, 2024
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scripts": {
"build": "turbo run build --filter=!infra-cdktf",
"clean": "turbo run clean",
"dev": "turbo run dev --concurrency 14",
"dev": "turbo run dev --concurrency 18",
"format": "prettier --write \"packages/*/src/**/*.{js,jsx,ts,tsx,scss}\"",
"lint": "turbo run lint",
"pages": "rm -rf node_modules && npm i -g pnpm turbo && pnpm i && pnpm build && ln -sf ./apps/spotlight/dist _site",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const SortableItemOverlay = ({

return (
<div
className={`${styles.draggableListWrapper} draggable-list-item-wrapper bg-white margin-bottom-3`}
className={`${styles.draggableListItemWrapper} draggable-list-item-wrapper bg-white margin-bottom-3`}
style={{
boxShadow: '0 16px 24px rgba(0, 0, 0, 0.4)',
cursor: 'grabbing',
Expand Down Expand Up @@ -181,7 +181,7 @@ const SortableItem = ({
return (
<li
className={classNames(
styles.draggableListWrapper,
styles.draggableListItemWrapper,
'draggable-list-item-wrapper',
'bg-white',
'cursor-pointer',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,37 @@ export const PatternEditActions = ({ children }: PatternEditActionsProps) => {
p => p.type === 'fieldset' && p.data.patterns.includes(focusPatternId)
);
}, [focusPatternId, patterns]);

const isFieldset = focusPatternType === 'fieldset';
const isPagePattern = focusPatternType === 'page';
const { copyPattern } = useFormManagerStore(state => ({
copyPattern: state.copyPattern,
}));
const pages = useFormManagerStore(state =>
Object.values(state.session.form.patterns).filter(p => p.type === 'page')
);
const fieldsets = useFormManagerStore(state =>
Object.values(state.session.form.patterns).filter(
p => p.type === 'fieldset'
)
);
const handleCopyPattern = () => {
const currentPageIndex = pages.findIndex(page =>
page.data.patterns.includes(focusPatternId || '')
);
const currentFieldsetIndex = fieldsets.findIndex(fieldset =>
fieldset.data.patterns.includes(focusPatternId)
);
const sourcePagePatternId = pages[currentPageIndex]?.id;
const sourceFieldsetPatternId = fieldsets[currentFieldsetIndex]?.id;

if (focusPatternId) {
if (sourcePagePatternId) {
copyPattern(sourcePagePatternId, focusPatternId);
} else {
copyPattern(sourceFieldsetPatternId, focusPatternId);
}
}
};
natashapl marked this conversation as resolved.
Show resolved Hide resolved

return (
<div
Expand Down Expand Up @@ -59,7 +87,7 @@ export const PatternEditActions = ({ children }: PatternEditActionsProps) => {
className="usa-button--outline usa-button--unstyled"
onClick={event => {
event.preventDefault();
alert('Unimplemented');
handleCopyPattern();
}}
>
<svg
Expand Down
29 changes: 19 additions & 10 deletions packages/design/src/FormManager/FormEdit/formEditStyles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,34 +47,39 @@

/* Draggable List */

.draggableListWrapper legend {
.draggableListItemWrapper legend {
padding-left: 1.5rem;
}

.draggableListWrapper .radioFormPattern legend {
.draggableListItemWrapper .radioFormPattern legend {
padding-left: 0;
}

.draggableListWrapper button {
.draggableListItemWrapper button {
cursor: pointer;
}

.draggableListWrapper:focus-within,
.draggableListWrapper button:not([disabled]):focus {
.draggableListItemWrapper:focus-within,
.draggableListItemWrapper button:not([disabled]):focus {
outline: 0.25rem solid #783cb9;
}

.draggableListWrapper [tabindex]:focus,
.draggableListWrapper:has(input:focus),
.draggableListWrapper:has(button:focus),
.draggableListWrapper:has(textarea:focus) {
.draggableListItemWrapper [tabindex]:focus,
.draggableListItemWrapper:has(input:focus),
.draggableListItemWrapper:has(button:focus),
.draggableListItemWrapper:has(textarea:focus) {
outline: none;
}

.draggableListWrapper .dropdownMenu {
.draggableListItemWrapper .dropdownMenu {
margin-top: 5px;
}

.draggableListItemWrapper p {
margin: 0;
padding: 1em 0;
}

/* Configure and Publish Pages */
.progressPage {
min-height: 60vh;
Expand Down Expand Up @@ -154,6 +159,10 @@
max-width: 15.625rem;
}

.moveToPageWrapper p {
padding-top: 0.5rem;
}

.movePatternButton {
color: #005ea2;
}
Expand Down
17 changes: 17 additions & 0 deletions packages/design/src/FormManager/FormEdit/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export type FormEditSlice = {
addPattern: (patternType: string) => void;
addPatternToFieldset: (patternType: string, targetPattern: PatternId) => void;
clearFocus: () => void;
copyPattern: (parentPatternId: PatternId, patternId: PatternId) => void;
deletePattern: (id: PatternId) => void;
deleteSelectedPattern: () => void;
movePattern: (
Expand Down Expand Up @@ -102,6 +103,22 @@ export const createFormEditSlice =
});
state.addNotification('success', 'Element moved successfully.');
},

copyPattern: (parentPatternId, patternId) => {
const state = get();
const builder = new BlueprintBuilder(
state.context.config,
state.session.form
);

const copyPattern = builder.copyPattern(parentPatternId, patternId);
set({
session: mergeSession(state.session, { form: builder.form }),
focus: { pattern: copyPattern },
});
state.addNotification('success', 'Element copied successfully.');
},

addPatternToFieldset: (patternType, targetPattern) => {
const state = get();
const builder = new BlueprintBuilder(
Expand Down
Loading
Loading