Skip to content

Commit b5ce407

Browse files
authored
Merge pull request #444 from sugarlabs/gsoc-dmp-2025/week-4/justin
DMP 2025 Week 4: feat(Masonry): Add palette to Masonry
2 parents 30a8a1f + 926edf2 commit b5ce407

20 files changed

+4765
-8
lines changed

modules/masonry/src/brick/view/components/BrickWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useEffect, useMemo } from 'react';
2-
import type { TBrickRenderProps } from '../../@types/brick';
2+
import type { TBrickRenderProps } from '../../../@types/brick';
33
import { generateBrickData } from '../../utils/path';
44
import type { TInputUnion } from '../../utils/path';
55
import { measureLabel } from '../../utils/textMeasurement';

modules/masonry/src/brick/view/components/compound.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import type { TBrickRenderPropsCompound } from '../../@types/brick';
2+
import type { TBrickRenderPropsCompound } from '../../../@types/brick';
33
import { BrickWrapper } from './BrickWrapper';
44
import type { TConnectionPoints } from '../utils/common';
55

@@ -11,11 +11,11 @@ export const CompoundBrickView: React.FC<PropsWithMetrics> = (props) => {
1111
const {
1212
topNotch,
1313
bottomNotch,
14-
bboxNest,
1514
isFolded,
1615
strokeWidth,
1716
scale,
1817
bboxArgs,
18+
bboxNest,
1919
...commonProps
2020
} = props;
2121

modules/masonry/src/brick/view/components/expression.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import type { TBrickRenderPropsExpression } from '../../@types/brick';
2+
import type { TBrickRenderPropsExpression } from '../../../@types/brick';
33
import { BrickWrapper } from './BrickWrapper';
44
import type { TConnectionPoints } from '../utils/common';
55

modules/masonry/src/brick/view/components/simple.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import type { TBrickRenderPropsSimple } from '../../@types/brick';
2+
import type { TBrickRenderPropsSimple } from '../../../@types/brick';
33
import { BrickWrapper } from './BrickWrapper';
44
import type { TConnectionPoints } from '../utils/common';
55

modules/masonry/src/brick/view/stories/compound.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React from 'react';
44
import type { Meta, StoryObj, Decorator } from '@storybook/react';
55
import { CompoundBrickView } from '../components/compound';
6-
import type { TBrickRenderPropsCompound } from '../../@types/brick';
6+
import type { TBrickRenderPropsCompound } from '../../../@types/brick';
77

88
const centerDecorator: Decorator<TBrickRenderPropsCompound> = (Story) => (
99
<div style={{ display: 'flex', justifyContent: 'center', padding: '2rem' }}>

modules/masonry/src/brick/view/stories/expression.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import type { Meta, StoryObj, Decorator } from '@storybook/react';
33
import { ExpressionBrickView } from '../components/expression';
4-
import type { TBrickRenderPropsExpression } from '../../@types/brick';
4+
import type { TBrickRenderPropsExpression } from '../../../@types/brick';
55

66
const centerDecorator: Decorator<TBrickRenderPropsExpression> = (Story) => (
77
<div style={{ display: 'flex', justifyContent: 'center', padding: '2rem' }}>

modules/masonry/src/brick/view/stories/simple.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import type { Meta, StoryFn } from '@storybook/react';
33
import { SimpleBrickView } from '../components/simple';
4-
import type { TBrickRenderPropsSimple } from '../../@types/brick';
4+
import type { TBrickRenderPropsSimple } from '../../../@types/brick';
55

66
export default {
77
title: 'Bricks/SimpleBrick',
Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 67 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)