Skip to content

Commit

Permalink
fix: remove invalid breakpoints (#661)
Browse files Browse the repository at this point in the history
  • Loading branch information
SwaySway committed Sep 20, 2022
1 parent 15af102 commit 047dbd6
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 2 deletions.
85 changes: 85 additions & 0 deletions packages/codegen-ui/lib/__tests__/utils/breakpoint-utils.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License").
You may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { StudioComponent } from '../../types';
import { getBreakpoints } from '../../utils';

type ComponentWithVariant = StudioComponent & Required<Pick<StudioComponent, 'variants'>>;

describe('breakpoint utils', () => {
it('should sort breakpoints correctly', () => {
const component: ComponentWithVariant = {
name: 'sample',
componentType: '',
properties: {},
bindingProperties: {},
variants: [
{
variantValues: {
breakpoint: 'xxl',
},
overrides: {},
},
{
variantValues: {
breakpoint: 'small',
},
overrides: {},
},
{
variantValues: {
breakpoint: 'base',
},
overrides: {},
},
],
};

const breakpoints = getBreakpoints(component);
expect(breakpoints).toStrictEqual(['base', 'small', 'xxl']);
});
it('should remove invalid breakpoint sizes', () => {
const component: ComponentWithVariant = {
name: 'sample',
componentType: '',
properties: {},
bindingProperties: {},
variants: [
{
variantValues: {
breakpoint: 'xxs',
},
overrides: {},
},
{
variantValues: {
breakpoint: 'base',
},
overrides: {},
},
{
variantValues: {
breakpoint: 'small',
},
overrides: {},
},
],
};

const breakpoints = getBreakpoints(component);
expect(breakpoints).toStrictEqual(['base', 'small']);
});
});
5 changes: 3 additions & 2 deletions packages/codegen-ui/lib/utils/breakpoint-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ export const sortBreakpoints = (bs: BreakpointSizeType[]): BreakpointSizeType[]

export const getBreakpoints = (component: StudioComponent & Required<Pick<StudioComponent, 'variants'>>) => {
const breakpoints = component.variants.reduce<BreakpointSizeType[]>((acc, variant) => {
if (variant.variantValues?.breakpoint) {
acc.push(variant.variantValues.breakpoint as BreakpointSizeType);
const breakpoint = variant.variantValues?.breakpoint as BreakpointSizeType | undefined;
if (breakpoint && breakpointSizes.includes(breakpoint)) {
acc.push(breakpoint);
}
return acc;
}, []);
Expand Down

0 comments on commit 047dbd6

Please sign in to comment.