Skip to content

Commit ede3c47

Browse files
committed
Merge branch 'main' into docs/storybook-v9
2 parents 6cf6d2e + 5664dd5 commit ede3c47

File tree

54 files changed

+2127
-2050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2127
-2050
lines changed

.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ body:
4646
description: By submitting this issue, I confirm to follow the recommendation not to disclose any internal or sensitive information.
4747
options:
4848
- label: I’m not disclosing any internal or sensitive information.
49-
validations:
50-
required: true
49+
required: true

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ body:
5454
description: By submitting this issue, I confirm to follow the recommendation not to disclose any internal or sensitive information.
5555
options:
5656
- label: I’m not disclosing any internal or sensitive information.
57-
validations:
58-
required: true
57+
required: true

.github/workflows/open-source-security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
- uses: actions/checkout@v4
1717

1818
- name: artifactPrepareVersion
19-
uses: SAP/[email protected].0
19+
uses: SAP/[email protected].1
2020
with:
2121
step-name: artifactPrepareVersion
2222
flags: --versioningType cloud_noTag
2323

2424
- name: detectExecuteScan
25-
uses: SAP/[email protected].0
25+
uses: SAP/[email protected].1
2626
with:
2727
step-name: detectExecuteScan
2828
flags: '--token ${{ secrets.DETECT_TOKEN }}'

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ jobs:
9292
--create-release github
9393
env:
9494
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
95-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
9695
NPM_CONFIG_PROVENANCE: true
9796

9897
- name: build
@@ -102,7 +101,6 @@ jobs:
102101
run: ${GITHUB_WORKSPACE}/node_modules/.bin/lerna publish from-git
103102
env:
104103
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
105-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
106104
NPM_CONFIG_PROVENANCE: true
107105

108106
### Semantic Release Bot comments for issues and PRs ###

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.0
1+
22.18.0

.storybook/components/ArgTypesWithNote.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { DomRefTable } from '@sb/components/DomRefTable.js';
12
import { ArgTypes } from '@storybook/addon-docs/blocks';
23
import MessageStripDesign from '@ui5/webcomponents/dist/types/MessageStripDesign.js';
34
import { MessageStrip } from '@ui5/webcomponents-react';
@@ -12,20 +13,30 @@ interface ArgTypesWithNotePropTypes {
1213
* Defaults to: "This component supports all HTML attributes."
1314
*/
1415
noteText?: ReactNode | ReactNode[];
16+
/**
17+
* If `true` all headings are rendered as `Heading`s instead of `Subheading`s.
18+
*/
19+
isHeading?: boolean;
1520
}
1621

1722
export function ArgTypesWithNote(props: ComponentProps<typeof ArgTypes> & ArgTypesWithNotePropTypes) {
18-
const { hideHTMLPropsNote, noteText, ...rest } = props;
23+
const { hideHTMLPropsNote, noteText, isHeading, ...rest } = props;
1924

2025
if (hideHTMLPropsNote) {
21-
return <ArgTypes {...rest} />;
26+
return (
27+
<>
28+
<ArgTypes {...rest} />
29+
<DomRefTable of={rest.of} isSubheading={!isHeading} />
30+
</>
31+
);
2232
}
2333
return (
2434
<div className={classes.tableContainer}>
2535
<MessageStrip design={MessageStripDesign.Information} hideCloseButton className={classes.strip}>
2636
{noteText ?? 'This component supports all HTML attributes.'}
2737
</MessageStrip>
2838
<ArgTypes {...rest} />
39+
<DomRefTable of={rest.of} isSubheading={!isHeading} />
2940
</div>
3041
);
3142
}

.storybook/components/DomRefTable.tsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Controls } from '@storybook/addon-docs/blocks';
2-
import { Heading, useOf } from '@storybook/addon-docs/blocks';
2+
import { Heading, Subheading, useOf } from '@storybook/addon-docs/blocks';
33
import TagDesign from '@ui5/webcomponents/dist/types/TagDesign.js';
44
import { Tag, Link, MessageStrip, Popover } from '@ui5/webcomponents-react';
55
import type * as CEM from '@ui5/webcomponents-tools/lib/cem/types';
@@ -48,14 +48,20 @@ function Name(props: CEM.ClassMember) {
4848
);
4949
}
5050

51-
export function DomRefTable({ of }: { of: ComponentProps<typeof Controls>['of'] }) {
51+
export function DomRefTable({
52+
of,
53+
isSubheading,
54+
}: {
55+
of: ComponentProps<typeof Controls>['of'];
56+
isSubheading?: boolean;
57+
}) {
5258
const { story: storyContext } = useOf<'story'>(of);
5359
const storyTags: string[] = storyContext.tags;
5460
const cemModuleName = storyTags?.find((tag) => tag.startsWith('cem-module:'));
55-
const componentName = storyContext.component.displayName;
61+
const componentName = of?.displayName ?? storyContext.component.displayName;
5662
const popoverRef = useRef(null);
5763

58-
const knownAttributes = new Set(Object.keys(storyContext.argTypes));
64+
const knownAttributes = new Set(Object.keys(of?.__docgenInfo?.props ?? storyContext.argTypes));
5965
const cem = useGetCem(storyTags);
6066
const moduleName = cemModuleName ? cemModuleName.split(':')[1] : componentName;
6167

@@ -69,12 +75,13 @@ export function DomRefTable({ of }: { of: ComponentProps<typeof Controls>['of']
6975
return !(knownAttributes.has(row.name) && !row.type?.text?.includes('HTMLElement'));
7076
}) ?? [];
7177
const cssParts: CEM.CssPart[] = componentMembers?.cssParts ?? [];
78+
const HeadingComponent = isSubheading ? Subheading : Heading;
7279

7380
return (
7481
<>
7582
{rows.length > 0 ? (
7683
<>
77-
<Heading>DOM Properties & Methods</Heading>
84+
<HeadingComponent>DOM Properties & Methods</HeadingComponent>
7885
<p>
7986
This component exposes public properties and methods. You can use them directly on the instance of the
8087
component, e.g. by using React Refs.
@@ -150,7 +157,7 @@ export function DomRefTable({ of }: { of: ComponentProps<typeof Controls>['of']
150157

151158
{cssParts.length > 0 ? (
152159
<>
153-
<Heading>CSS Shadow Parts</Heading>
160+
<HeadingComponent>CSS Shadow Parts</HeadingComponent>
154161
<p>
155162
<Link target={'_blank'} href={'https://developer.mozilla.org/en-US/docs/Web/CSS/::part'}>
156163
CSS Shadow Parts

docs/knowledge-base/FAQ.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import SbTagFilter from '@sb/images/sb-pkg-filter.png';
1414
children={
1515
<>
1616
Please also take a look at the FAQ of{' '}
17-
<ui5-link href="https://sap.github.io/ui5-webcomponents/playground/?path=/docs/docs-faq">
17+
<ui5-link href="https://sap.github.io/ui5-webcomponents/docs/FAQ/">
1818
UI5 Web Components
1919
</ui5-link>
2020
.

0 commit comments

Comments
 (0)