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

Updates for mapping editor (CMEM-5432) #147

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
29f72c4
Forward ref for CardContent
silkservice Feb 8, 2024
008855b
Merge remote-tracking branch 'origin/release/v23.4.2' into feature/ne…
silkservice Feb 13, 2024
259ded7
Add 'Compare' icon
silkservice Mar 12, 2024
4177206
Merge remote-tracking branch 'origin/develop' into feature/newMapping…
haschek Mar 20, 2024
e77a91e
improve style import from libs
haschek Mar 21, 2024
4b2625f
fix and change behavior if onItemClick is executed or not
haschek Mar 26, 2024
d27b058
display card borderless if elevation is set to -1
haschek Mar 26, 2024
4f71075
fix default value for card elevation
haschek Mar 27, 2024
de2a127
add flexible layout helper components
haschek Apr 2, 2024
45982dc
Merge remote-tracking branch 'origin/develop' into feature/newMapping…
haschek Apr 8, 2024
668a23a
add user stories for FlexibleLayout* documentation
haschek Apr 9, 2024
522f75f
fix default layout and add property for space usage
haschek Apr 9, 2024
c714281
update changelog
haschek Apr 9, 2024
a147dc0
adjust color for property
haschek Apr 11, 2024
8e6c01d
Merge branch 'develop' into feature/newMappingSuggestion-CMEM-5433
silkservice Aug 27, 2024
2950146
Merge remote-tracking branch 'origin/next' into feature/newMappingSug…
haschek Sep 24, 2024
c94d340
Merge remote-tracking branch 'origin/next' into feature/newMappingSug…
haschek Oct 2, 2024
3891bca
Merge remote-tracking branch 'origin/next' into feature/newMappingSug…
haschek Oct 7, 2024
f748b14
Merge branch 'release/v24.0.0' into feature/newMappingSuggestion-CMEM…
andreas-schultz Dec 5, 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
Prev Previous commit
Next Next commit
add user stories for FlexibleLayout* documentation
  • Loading branch information
haschek committed Apr 9, 2024
commit 668a23a606382540f86ddb4383e0ac546f298fe4
4 changes: 2 additions & 2 deletions src/components/FlexibleLayout/FlexibleLayoutContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import React, { forwardRef } from "react"; // @see https://github.com/storybookjs/storybook/issues/8881#issuecomment-831937051

import { CLASSPREFIX as eccgui } from "../../configuration/constants";

@@ -20,7 +20,7 @@ export interface FlexibleLayoutContainerProps extends React.HTMLAttributes<HTMLD
* A `FlexibleLayoutContainer` can contain `FlexibleLayoutItem`s.
* Do not misuse it as grid because it comes without any predefined ratios for widths and heights.
*/
export const FlexibleLayoutContainer = React.forwardRef<HTMLDivElement, FlexibleLayoutContainerProps>(
export const FlexibleLayoutContainer = forwardRef<HTMLDivElement, FlexibleLayoutContainerProps>(
(
{ children, className = "", useAbsoluteSpace, horizontal, ...otherDivProps }: FlexibleLayoutContainerProps,
ref
4 changes: 2 additions & 2 deletions src/components/FlexibleLayout/FlexibleLayoutItem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import React, { forwardRef } from "react";

import { CLASSPREFIX as eccgui } from "../../configuration/constants";

@@ -24,7 +24,7 @@ export interface FlexibleLayoutItemProps extends React.HTMLAttributes<HTMLDivEle
* `FlexibleLayoutItem`s can contain `FlexibleLayoutContainer` for more partitions.
* `FlexibleLayoutItem` siblings will share all available space from the `FlexibleLayoutContainer` container.
*/
export const FlexibleLayoutItem = React.forwardRef<HTMLDivElement, FlexibleLayoutItemProps>(
export const FlexibleLayoutItem = forwardRef<HTMLDivElement, FlexibleLayoutItemProps>(
(
{
children,
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from "react";
import { LoremIpsum } from "react-lorem-ipsum";
import { Meta, StoryFn } from "@storybook/react";

import { Divider, FlexibleLayoutContainer, FlexibleLayoutItem, HtmlContentBlock } from "../../../../index";

export default {
title: "Components/FlexibleLayout/Container",
component: FlexibleLayoutContainer,
} as Meta<typeof FlexibleLayoutContainer>;

const Template: StoryFn<typeof FlexibleLayoutContainer> = (args) => (
<div style={{ position: "relative", height: "400px" }}>
<FlexibleLayoutContainer {...args}>
<FlexibleLayoutItem>
<HtmlContentBlock>
<LoremIpsum p={1} avgSentencesPerParagraph={3} random={false} />
</HtmlContentBlock>
</FlexibleLayoutItem>
<FlexibleLayoutItem>
<Divider />
<HtmlContentBlock>
<LoremIpsum p={3} avgSentencesPerParagraph={2} random={false} />
</HtmlContentBlock>
</FlexibleLayoutItem>
</FlexibleLayoutContainer>
</div>
);

export const Default = Template.bind({});
Default.args = {};
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from "react";
import { LoremIpsum } from "react-lorem-ipsum";
import { Meta, StoryFn } from "@storybook/react";

import { FlexibleLayoutContainer, FlexibleLayoutItem, HtmlContentBlock } from "../../../../index";

export default {
title: "Components/FlexibleLayout/Item",
component: FlexibleLayoutItem,
} as Meta<typeof FlexibleLayoutItem>;

const Template: StoryFn<typeof FlexibleLayoutItem> = (args) => (
<FlexibleLayoutContainer horizontal>
<FlexibleLayoutItem>
<HtmlContentBlock>
<LoremIpsum p={1} avgSentencesPerParagraph={1} avgWordsPerSentence={3} random={false} />
</HtmlContentBlock>
</FlexibleLayoutItem>
<FlexibleLayoutItem {...args}>
<HtmlContentBlock>
<LoremIpsum p={2} avgSentencesPerParagraph={4} random={false} />
</HtmlContentBlock>
</FlexibleLayoutItem>
</FlexibleLayoutContainer>
);

export const Default = Template.bind({});
Default.args = {};