Skip to content

Commit 24df790

Browse files
authored
fix(ui5-tooling-modules): avoid width/height property for base classes (#1284)
1 parent 0abf893 commit 24df790

Some content is hidden

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

47 files changed

+48
-48
lines changed

packages/ui5-tooling-modules/lib/utils/WebComponentRegistry.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ class RegistryEntry {
880880
}
881881

882882
// cssProperties: [ "width", "height", "display" ]
883-
if (!this.#ui5PropertyExistsInParentChain(classDef, "width")) {
883+
if (ui5metadata.tag && !this.#ui5PropertyExistsInParentChain(classDef, "width")) {
884884
ui5metadata.properties["width"] = {
885885
type: "sap.ui.core.CSSSize",
886886
mapping: "style",
@@ -905,7 +905,7 @@ class RegistryEntry {
905905
});
906906
}
907907

908-
if (!this.#ui5PropertyExistsInParentChain(classDef, "height")) {
908+
if (ui5metadata.tag && !this.#ui5PropertyExistsInParentChain(classDef, "height")) {
909909
ui5metadata.properties["height"] = {
910910
type: "sap.ui.core.CSSSize",
911911
mapping: "style",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["getText"]}
1+
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["getText"]}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["setCurrentItem","setRowSize"]}
1+
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["setCurrentItem","setRowSize"]}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["register","deregister"]}
1+
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["register","deregister"]}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{},"associations":{},"events":{},"getters":["effectiveDir","isUI5Element"],"methods":["onBeforeRendering","onAfterRendering","onEnterDOM","onExitDOM","attachInvalidate","detachInvalidate","onInvalidation","getDomRef","getFocusDomRef","getFocusDomRefAsync","focus","fireEvent","fireDecoratorEvent","getSlottedNodes","attachComponentStateFinalized","detachComponentStateFinalized","getUniqueDependencies","define","getMetadata"]}
1+
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"}},"aggregations":{},"associations":{},"events":{},"getters":["effectiveDir","isUI5Element"],"methods":["onBeforeRendering","onAfterRendering","onEnterDOM","onExitDOM","attachInvalidate","detachInvalidate","onInvalidation","getDomRef","getFocusDomRef","getFocusDomRefAsync","focus","fireEvent","fireDecoratorEvent","getSlottedNodes","attachComponentStateFinalized","detachComponentStateFinalized","getUniqueDependencies","define","getMetadata"]}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["validateSlotValue","getPureTag","getTag","hasAttribute","getPropertiesList","getAttributesList","hasSlots","hasIndividualSlots","slotsAreManaged","supportsF6FastNavigation","getProperties","getEvents","getSlots"]}
1+
{"namespace":"@ui5/webcomponents-base","qualifiedNamespace":"@ui5.webcomponents-base","interfaces":[],"properties":{"text":{"type":"string","mapping":"textContent"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":["validateSlotValue","getPureTag","getTag","hasAttribute","getPropertiesList","getAttributesList","hasSlots","hasIndividualSlots","slotsAreManaged","supportsF6FastNavigation","getProperties","getEvents","getSlots"]}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","tag":"ui5-li-notification-group","interfaces":[],"properties":{"collapsed":{"type":"boolean","mapping":"property","defaultValue":false},"growing":{"type":"@ui5.webcomponents.NotificationListGrowingMode","mapping":"property","defaultValue":"None"},"titleText":{"type":"string","mapping":"property"},"read":{"type":"boolean","mapping":"property","defaultValue":false},"loading":{"type":"boolean","mapping":"property","defaultValue":false},"loadingDelay":{"type":"float","mapping":"property","defaultValue":1000}},"aggregations":{"items":{"type":"@ui5.webcomponents-fiori.dist.NotificationListItem","multiple":true}},"associations":{},"events":{"toggle":{"allowPreventDefault":false,"enableEventBubbling":true,"parameters":{}},"loadMore":{"allowPreventDefault":false,"enableEventBubbling":true,"parameters":{}}},"getters":[],"methods":[],"defaultAggregation":"items"}
1+
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","tag":"ui5-li-notification-group","interfaces":[],"properties":{"collapsed":{"type":"boolean","mapping":"property","defaultValue":false},"growing":{"type":"@ui5.webcomponents.NotificationListGrowingMode","mapping":"property","defaultValue":"None"},"titleText":{"type":"string","mapping":"property"},"read":{"type":"boolean","mapping":"property","defaultValue":false},"loading":{"type":"boolean","mapping":"property","defaultValue":false},"loadingDelay":{"type":"float","mapping":"property","defaultValue":1000},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{"items":{"type":"@ui5.webcomponents-fiori.dist.NotificationListItem","multiple":true}},"associations":{},"events":{"toggle":{"allowPreventDefault":false,"enableEventBubbling":true,"parameters":{}},"loadMore":{"allowPreventDefault":false,"enableEventBubbling":true,"parameters":{}}},"getters":[],"methods":[],"defaultAggregation":"items"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","tag":"ui5-li-notification","interfaces":[],"properties":{"wrappingType":{"type":"@ui5.webcomponents.WrappingType","mapping":"property","defaultValue":"None"},"state":{"type":"sap.ui.core.ValueState","mapping":{"formatter":"_mapValueState","parser":"_parseValueState"},"defaultValue":"None"},"showClose":{"type":"boolean","mapping":"property","defaultValue":false},"importance":{"type":"@ui5.webcomponents-fiori.NotificationListItemImportance","mapping":"property","defaultValue":"Standard"},"titleText":{"type":"string","mapping":"property"},"read":{"type":"boolean","mapping":"property","defaultValue":false},"loading":{"type":"boolean","mapping":"property","defaultValue":false},"loadingDelay":{"type":"float","mapping":"property","defaultValue":1000}},"aggregations":{"avatar":{"type":"sap.ui.core.Control","multiple":true,"slot":"avatar"},"menu":{"type":"sap.ui.core.Control","multiple":true,"slot":"menu"},"footnotes":{"type":"sap.ui.core.Control","multiple":true,"slot":"footnotes"},"description":{"type":"sap.ui.core.Control","multiple":true}},"associations":{},"events":{"close":{"allowPreventDefault":false,"enableEventBubbling":true,"parameters":{"item":{"type":"sap.ui.core.Control","types":[{"origType":"HTMLElement","multiple":false,"dedicatedTypes":[{"dtsType":"Control","packageName":"sap/ui/core/Control","moduleType":"module:sap/ui/core/Control","ui5Type":"sap.ui.core.Control","isClass":true}]}],"dtsParamDescription":"the closed item."}}}},"getters":[],"methods":[],"defaultAggregation":"description"}
1+
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","tag":"ui5-li-notification","interfaces":[],"properties":{"wrappingType":{"type":"@ui5.webcomponents.WrappingType","mapping":"property","defaultValue":"None"},"state":{"type":"sap.ui.core.ValueState","mapping":{"formatter":"_mapValueState","parser":"_parseValueState"},"defaultValue":"None"},"showClose":{"type":"boolean","mapping":"property","defaultValue":false},"importance":{"type":"@ui5.webcomponents-fiori.NotificationListItemImportance","mapping":"property","defaultValue":"Standard"},"titleText":{"type":"string","mapping":"property"},"read":{"type":"boolean","mapping":"property","defaultValue":false},"loading":{"type":"boolean","mapping":"property","defaultValue":false},"loadingDelay":{"type":"float","mapping":"property","defaultValue":1000},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{"avatar":{"type":"sap.ui.core.Control","multiple":true,"slot":"avatar"},"menu":{"type":"sap.ui.core.Control","multiple":true,"slot":"menu"},"footnotes":{"type":"sap.ui.core.Control","multiple":true,"slot":"footnotes"},"description":{"type":"sap.ui.core.Control","multiple":true}},"associations":{},"events":{"close":{"allowPreventDefault":false,"enableEventBubbling":true,"parameters":{"item":{"type":"sap.ui.core.Control","types":[{"origType":"HTMLElement","multiple":false,"dedicatedTypes":[{"dtsType":"Control","packageName":"sap/ui/core/Control","moduleType":"module:sap/ui/core/Control","ui5Type":"sap.ui.core.Control","isClass":true}]}],"dtsParamDescription":"the closed item."}}}},"getters":[],"methods":[],"defaultAggregation":"description"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","tag":"ui5-search-item","interfaces":[],"properties":{"text":{"type":"string","mapping":"property"},"description":{"type":"string","mapping":"property"},"icon":{"type":"string","mapping":"property"},"selected":{"type":"boolean","mapping":"property","defaultValue":false},"scopeName":{"type":"string","mapping":"property"}},"aggregations":{"image":{"type":"sap.ui.core.Control","multiple":true,"slot":"image"}},"associations":{},"events":{"delete":{"allowPreventDefault":false,"enableEventBubbling":false,"parameters":{}}},"getters":[],"methods":[]}
1+
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","tag":"ui5-search-item","interfaces":[],"properties":{"text":{"type":"string","mapping":"property"},"description":{"type":"string","mapping":"property"},"icon":{"type":"string","mapping":"property"},"selected":{"type":"boolean","mapping":"property","defaultValue":false},"scopeName":{"type":"string","mapping":"property"},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{"image":{"type":"sap.ui.core.Control","multiple":true,"slot":"image"}},"associations":{},"events":{"delete":{"allowPreventDefault":false,"enableEventBubbling":false,"parameters":{}}},"getters":[],"methods":[]}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","interfaces":[],"properties":{"text":{"type":"string","mapping":"property"},"enabled":{"type":"boolean","defaultValue":"true","mapping":{"type":"property","to":"disabled","formatter":"_mapEnabled"}},"width":{"type":"sap.ui.core.CSSSize","mapping":"style"},"height":{"type":"sap.ui.core.CSSSize","mapping":"style"}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":[]}
1+
{"namespace":"@ui5/webcomponents-fiori","qualifiedNamespace":"@ui5.webcomponents-fiori","interfaces":[],"properties":{"text":{"type":"string","mapping":"property"},"enabled":{"type":"boolean","defaultValue":"true","mapping":{"type":"property","to":"disabled","formatter":"_mapEnabled"}}},"aggregations":{},"associations":{},"events":{},"getters":[],"methods":[]}

0 commit comments

Comments
 (0)