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

fix(withWebComponent): Add handler of events those are not specified in metadata of ui5-webcomponents #315

Merged
merged 13 commits into from
Feb 13, 2020
Merged

fix(withWebComponent): Add handler of events those are not specified in metadata of ui5-webcomponents #315

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ed0a8a9
fix(AnalyticalTable): Each column can have groupable, sortable, filte…
gnseo Jan 13, 2020
778331e
Update packages/main/src/components/AnalyticalTable/index.tsx
gnseo Jan 15, 2020
9e2a931
Update packages/main/src/components/AnalyticalTable/index.tsx
gnseo Jan 15, 2020
95f41e2
Update packages/main/src/components/AnalyticalTable/index.tsx
gnseo Jan 15, 2020
8bb13d1
Merge branch 'master' into master
MarcusNotheis Jan 15, 2020
0c136b9
Merge branch 'master' of git://github.com/sap/ui5-webcomponents-react
gnseo Feb 12, 2020
e035167
fix(withWebComponent): Add handler of events those are not specified …
gnseo Feb 12, 2020
4976647
Merge branch 'master' into master
MarcusNotheis Feb 12, 2020
b676fa9
Merge branch 'master' into master
MarcusNotheis Feb 12, 2020
6eb3624
Merge branch 'master' into master
MarcusNotheis Feb 12, 2020
c04ec3a
Update packages/main/src/internal/withWebComponent.tsx
gnseo Feb 13, 2020
39d7bf9
Update packages/main/src/internal/withWebComponent.tsx
gnseo Feb 13, 2020
f6881e4
Update withWebComponent.tsx
MarcusNotheis Feb 13, 2020
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
22 changes: 15 additions & 7 deletions packages/main/src/internal/withWebComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,14 @@ export const withWebComponent = <T extends any>(
return Object.keys(getWebComponentMetadata().getSlots());
};

const getEventsFromMetadata = (): string[] => {
return Object.keys(getWebComponentMetadata().getEvents() || {}).filter((eventName) => !eventName.startsWith('_'));
const getEventsFromMetadata = (otherProps = {}): string[] => {
return Object.keys(getWebComponentMetadata().getEvents() || {})
.filter((eventName) => !eventName.startsWith('_'))
.concat(
Object.keys(otherProps)
.filter((key) => key.startsWith('on'))
.map((key) => key.replace('on', '').toLowerCase())
);
};

const createEventWrapperFor = (eventIdentifier, eventHandler) => (e) => {
Expand Down Expand Up @@ -97,9 +103,11 @@ export const withWebComponent = <T extends any>(
}, {});
};

const { className, ...otherProps } = props;

useEffect(
() => {
getEventsFromMetadata().forEach((eventName) => {
getEventsFromMetadata(otherProps).forEach((eventName) => {
const eventPropName = 'on' + capitalizeFirstLetter(eventName);
const eventHandler = props[eventPropName];

Expand All @@ -115,16 +123,16 @@ export const withWebComponent = <T extends any>(
}
});
},
getEventsFromMetadata().map((eventName) => props[`on${capitalizeFirstLetter(eventName)}`])
getEventsFromMetadata(otherProps).map((eventName) => props[`on${capitalizeFirstLetter(eventName)}`])
);

const { className, ...otherProps } = props;

const propsList = getWebComponentMetadata().getPropsList();

const { regularProps: passedProps, slotProps: actualSlotProps } = Object.entries(otherProps)
.filter(([key]) => !getBooleanPropsFromMetadata().includes(key))
.filter(([key]) => !getEventsFromMetadata().some((eventKey) => `on${capitalizeFirstLetter(eventKey)}` === key))
.filter(
([key]) => !getEventsFromMetadata(otherProps).some((eventKey) => `on${capitalizeFirstLetter(eventKey)}` === key)
)
.reduce(
(acc, [key, value]) => {
if (getSlotsFromMetadata().includes(key)) {
Expand Down