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.

Sign up for GitHub

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

Jump to bottom

Refactor: Update DonationAmountLevels template to support descriptions #7363

Merged
merged 5 commits into from
Apr 24, 2024
Merged

Refactor: Update DonationAmountLevels template to support descriptions #7363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00f12b6
feature: add descriptions ui
JoshuaHungDinh Apr 17, 2024
a3b3015
feature: group levels by with or without descriptions
pauloiankoski Apr 23, 2024
e78c1e3
refactor: implement group and style options
pauloiankoski Apr 23, 2024
c8c54f8
refactor: keep legacy style when no descriptions to be shown
pauloiankoski Apr 23, 2024
5c44d68
fix: remove unused attributes from type
pauloiankoski Apr 24, 2024
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
58 changes: 43 additions & 15 deletions src/DonationForms/resources/registrars/templates/fields/Amount/DonationAmountLevels.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import classNames from 'classnames';
type DonationAmountLevelsProps = {
name: string;
currency: string;
levels: number[];
levels: {label: string; value: number}[];
onLevelClick?: (amount: number) => void;
};

/**
* @unreleased add level descriptions.
* @since 3.0.0
*/
export default function DonationAmountLevels({
Expand All @@ -23,24 +24,51 @@ export default function DonationAmountLevels({
const amount = useWatch({name});
const formatter = useCurrencyFormatter(currency);

const groupedLevels = levels.reduce(
(acc, level) => {
const key = level.label ? 'labeled' : 'unlabeled';
acc[key].push(level);
return acc;
},
{labeled: [], unlabeled: []}
);

const allLevels = [...groupedLevels.labeled, ...groupedLevels.unlabeled];

return (
<div className="givewp-fields-amount__levels-container">
{levels.map((levelAmount, index) => {
const label = formatter.format(levelAmount);
const selected = levelAmount === amount;
<div
className={classNames('givewp-fields-amount__levels-container', {
'givewp-fields-amount__levels-container--has-descriptions': groupedLevels.labeled.length > 0,
})}
>
{allLevels.map((level, index) => {
const label = formatter.format(level.value);
const selected = level.value === amount;
const hasDescription = level.label;

return (
<button
className={classNames('givewp-fields-amount__level', {
'givewp-fields-amount__level--selected': selected,
<div
className={classNames('givewp-fields-amount__level-container', {
'givewp-fields-amount__level-container--col': hasDescription,
})}
type="button"
onClick={() => {
onLevelClick(levelAmount);
}}
key={index}
>
{label}
</button>
<button
className={classNames('givewp-fields-amount__level', {
'givewp-fields-amount__level--selected': selected,
'givewp-fields-amount__level--description': hasDescription,
})}
type="button"
onClick={() => {
onLevelClick(level.value);
}}
key={index}
>
{label}
</button>
{hasDescription && (
<span className={'givewp-fields-amount__level__description'}>{level.label}</span>
)}
</div>
);
})}
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/DonationForms/resources/registrars/templates/fields/Amount/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export default function Amount({
fixedAmountValue,
allowCustomAmount,
messages,
descriptions,
descriptionsEnabled
}: AmountProps) {
const isFixedAmount = !allowLevels;
const [customAmountValue, setCustomAmountValue] = useState<string>(
Expand Down Expand Up @@ -76,6 +78,8 @@ export default function Amount({
resetCustomAmount();
setValue(name, levelAmount);
}}
descriptions={descriptions}
descriptionsEnabled={descriptionsEnabled}
/>
)}

Expand Down
39 changes: 37 additions & 2 deletions src/DonationForms/resources/styles/components/_amount.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,50 @@ $borderColor: #9A9A9A;

&__levels-container {
display: grid;
grid-auto-rows: 1fr;
grid-template-columns: repeat(2, 1fr);
gap: var(--givewp-spacing-2);
grid-template-rows: repeat(2, 1fr);
inline-size: 100%;
list-style: none;

@media screen and (min-width: variables.$givewp-breakpoint-sm) {
grid-template-columns: repeat(3, 1fr);
}

&--has-descriptions {
display: flex;
flex-wrap: wrap;
}

.givewp-fields-amount__level-container {
display: flex;
align-items: center;
flex: 1;
gap: var(--givewp-spacing-4);
min-width: calc((100% - var(--givewp-spacing-2)) / 2);

@media screen and (min-width: variables.$givewp-breakpoint-sm) {
min-width: calc((100% - var(--givewp-spacing-2) * 2) / 3);
}

&--col {
flex-basis: 100%;
}
;

.givewp-fields-amount__level {
height: 100%;

&--description {
max-width: 144px;
}
}

.givewp-fields-amount__description {
margin-bottom: 0;
color: var(--givewp-grey-700);
font-size: 1rem;
}
}
}

&__level {
Expand Down
3 changes: 0 additions & 3 deletions src/FormBuilder/resources/js/form-builder/src/blocks/fields/amount/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import type {subscriptionPeriod} from '@givewp/forms/registrars/templates/groups
export interface DonationAmountAttributes {
label: string;
levels: OptionProps[];
descriptions: string[];
descriptionsEnabled: boolean;
defaultLevel: number;
priceOption: string;
setPrice: number;
customAmount: boolean;
Expand Down
Loading