@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/src/sap/fe/macros/internal/SituationsIndicator-dbg.js

@@ -57,10 +57,10 @@ sap.ui.define(["sap/fe/macros/MacroMetadata", "sap/fe/macros/ResourceModel", "sa
       }
     },
     create: function (oProps) {
-      var _entitySet$entityType;
+      var _entitySet$entityType, _entitySet$entityType2, _entitySet$entityType3;
 
       var entitySet = convertMetaModelContext(oProps.entitySet);
-      oProps.situations = (_entitySet$entityType = entitySet.entityType.annotations.FE) === null || _entitySet$entityType === void 0 ? void 0 : _entitySet$entityType.Situations;
+      oProps.situations = entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$entityType = entitySet.entityType) === null || _entitySet$entityType === void 0 ? void 0 : (_entitySet$entityType2 = _entitySet$entityType.annotations) === null || _entitySet$entityType2 === void 0 ? void 0 : (_entitySet$entityType3 = _entitySet$entityType2.FE) === null || _entitySet$entityType3 === void 0 ? void 0 : _entitySet$entityType3.Situations;
       return oProps;
     },
     getTemplate: function (oProps) {
@@ -94,4 +94,4 @@ sap.ui.define(["sap/fe/macros/MacroMetadata", "sap/fe/macros/ResourceModel", "sa
   });
   return SituationsIndicator;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["SituationsIndicator.ts"],"names":["SituationsIndicator","MacroMetadata","extend","name","namespace","metadata","stereotype","properties","entitySet","type","required","$kind","propertyPath","create","oProps","convertMetaModelContext","situations","entityType","annotations","FE","Situations","getTemplate","numberOfSituations","bindingExpression","path","visible","greaterThan","formatResult","formatters","isVisible","text","ifElse","tooltip","equal","ResourceModel","getText","onPress","fn","showPopover","ref","xml","compileBinding"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;;;;;;;;;;;AAwBA,MAAMA,mBAAmB,GAAGC,aAAa,CAACC,MAAd,CAAqB,4CAArB,EAAmE;AAC9F;AACD;AACA;AACCC,IAAAA,IAAI,EAAE,qBAJwF;;AAK9F;AACD;AACA;AACCC,IAAAA,SAAS,EAAE,wBARmF;;AAU9F;AACD;AACA;AACCC,IAAAA,QAAQ,EAAE;AACT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE,UAJH;;AAKT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE;AACXC,QAAAA,SAAS,EAAE;AACVC,UAAAA,IAAI,EAAE,sBADI;AAEVC,UAAAA,QAAQ,EAAE,IAFA;AAGVC,UAAAA,KAAK,EAAE;AAHG,SADA;AAOXC,QAAAA,YAAY,EAAE;AACbH,UAAAA,IAAI,EAAE,QADO;AAEbC,UAAAA,QAAQ,EAAE;AAFG;AAPH;AARH,KAboF;AAkC9FG,IAAAA,MAAM,EAAE,UAASC,MAAT,EAA6B;AAAA;;AACpC,UAAMN,SAAS,GAAGO,uBAAuB,CAACD,MAAM,CAACN,SAAR,CAAzC;AAEAM,MAAAA,MAAM,CAACE,UAAP,4BAAoBR,SAAS,CAACS,UAAV,CAAqBC,WAArB,CAAiCC,EAArD,0DAAoB,sBAAqCC,UAAzD;AAEA,aAAON,MAAP;AACA,KAxC6F;AA0C9FO,IAAAA,WA1C8F,YA0ClFP,MA1CkF,EA0C9D;AAC/B,UAAI,CAACA,MAAM,CAACE,UAAZ,EAAwB;AACvB;AACA,OAH8B,CAG7B;;;AAEF,UAAMM,kBAAkB,GAAGC,iBAAiB,WAAIT,MAAM,CAACE,UAAP,CAAkBQ,IAAtB,4BAA5C,CAL+B,CAO/B;;AACA,UAAIC,OAAJ;;AACA,UAAI,CAACX,MAAM,CAACF,YAAZ,EAA0B;AACzB;AACAa,QAAAA,OAAO,GAAGC,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAArB;AACA,OAHD,MAGO;AACN;AACA;AACA;AACAG,QAAAA,OAAO,GAAGE,YAAY,CACrB,CAACL,kBAAD,EAAqBC,iBAAiB,CAAC,8BAAD,EAAiC,UAAjC,CAAtC,EAAoFT,MAAM,CAACF,YAA3F,CADqB,EAErBgB,UAAU,CAACC,SAFU,CAAtB;AAIA,OApB8B,CAsB/B;;;AACA,UAAMC,IAAI,GAAGC,MAAM,CAACL,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAAZ,EAAqCA,kBAArC,EAAyD,EAAzD,CAAnB,CAvB+B,CAyB/B;;AACA,UAAMU,OAAO,GAAGD,MAAM,CACrBE,KAAK,CAACX,kBAAD,EAAqB,CAArB,CADgB,EAErBY,aAAa,CAACC,OAAd,CAAsB,2BAAtB,CAFqB,EAGrBR,YAAY,CAAC,CAACO,aAAa,CAACC,OAAd,CAAsB,yBAAtB,CAAD,EAAmDb,kBAAnD,CAAD,EAAyEM,UAAU,CAACI,OAApF,CAHS,CAAtB,CA1B+B,CAgC/B;;AACA,UAAMI,OAAO,GAAGC,EAAE,CAACC,WAAD,EAAc,CAACC,GAAG,CAAC,aAAD,CAAJ,EAAqBA,GAAG,CAAC,QAAD,CAAxB,EAAoCzB,MAAM,CAACE,UAAP,CAAkBQ,IAAtD,CAAd,CAAlB;AAEA,aAAOgB,GAAP,waAKUC,cAAc,CAACX,IAAD,CALxB,EAMaW,cAAc,CAACT,OAAD,CAN3B,EAOaS,cAAc,CAAChB,OAAD,CAP3B,EAQWgB,cAAc,CAACL,OAAD,CARzB;AAUA;AAvF6F,GAAnE,CAA5B;SA0FepC,mB","sourceRoot":".","sourcesContent":["import { MacroMetadata, ResourceModel } from \"sap/fe/macros\";\nimport Context from \"sap/ui/model/Context\";\nimport {\n\tbindingExpression,\n\tcompileBinding,\n\tequal,\n\tfn,\n\tformatResult,\n\tgreaterThan,\n\tifElse,\n\tref\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { xml } from \"sap/fe/macros/MacroRuntime\";\nimport { convertMetaModelContext } from \"sap/fe/core/converters/MetaModelConverter\";\nimport { NavigationProperty } from \"@sap-ux/annotation-converter\";\nimport { showPopover } from \"sap/fe/macros/internal/situations/Runtime\";\nimport { PathAnnotationExpression } from \"@sap-ux/vocabularies-types\";\nimport formatters from \"sap/fe/macros/internal/situations/Formatter\";\n\ntype PublicProperties = {\n\tentitySet: Context;\n\tpropertyPath?: string;\n};\n\ntype Properties = PublicProperties & { situations: PathAnnotationExpression<NavigationProperty> | undefined };\n\nconst SituationsIndicator = MacroMetadata.extend(\"sap.fe.macros.internal.SituationsIndicator\", {\n\t/**\n\t * Name\n\t */\n\tname: \"SituationsIndicator\",\n\t/**\n\t * Namespace\n\t */\n\tnamespace: \"sap.fe.macros.internal\",\n\n\t/**\n\t * Metadata\n\t */\n\tmetadata: {\n\t\t/**\n\t\t * Define macro stereotype for documentation\n\t\t */\n\t\tstereotype: \"xmlmacro\",\n\t\t/**\n\t\t * Properties.\n\t\t */\n\t\tproperties: {\n\t\t\tentitySet: {\n\t\t\t\ttype: \"sap.ui.model.Context\",\n\t\t\t\trequired: true,\n\t\t\t\t$kind: \"EntitySet\"\n\t\t\t},\n\n\t\t\tpropertyPath: {\n\t\t\t\ttype: \"string\",\n\t\t\t\trequired: false\n\t\t\t}\n\t\t}\n\t},\n\tcreate: function(oProps: Properties) {\n\t\tconst entitySet = convertMetaModelContext(oProps.entitySet);\n\n\t\toProps.situations = entitySet.entityType.annotations.FE?.Situations;\n\n\t\treturn oProps;\n\t},\n\n\tgetTemplate(oProps: Properties) {\n\t\tif (!oProps.situations) {\n\t\t\treturn;\n\t\t} // do not provide a template if Situations are unsupported\n\n\t\tconst numberOfSituations = bindingExpression(`${oProps.situations.path}/SitnNumberOfInstances`);\n\n\t\t// Indicator visibility\n\t\tlet visible;\n\t\tif (!oProps.propertyPath) {\n\t\t\t// no propertyPath --> visibility depends on the number of situations only\n\t\t\tvisible = greaterThan(numberOfSituations, 0);\n\t\t} else {\n\t\t\t// propertyPath --> visibility depends on the number of situations and on the semantic key used for showing indicators\n\t\t\t// TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&'\n\t\t\t// (or the expression parser fails if &amp;&amp; is used instead). Could be expressed as a simple expression binding.\n\t\t\tvisible = formatResult(\n\t\t\t\t[numberOfSituations, bindingExpression(\"semanticKeyHasDraftIndicator\", \"internal\"), oProps.propertyPath],\n\t\t\t\tformatters.isVisible\n\t\t\t);\n\t\t}\n\n\t\t// Button text: the number of situations if there are multiple, the empty string otherwise\n\t\tconst text = ifElse(greaterThan(numberOfSituations, 1), numberOfSituations, \"\");\n\n\t\t// Button tooltip: \"There is one situation\" / \"There are <n> situations\"\n\t\tconst tooltip = ifElse(\n\t\t\tequal(numberOfSituations, 1),\n\t\t\tResourceModel.getText(\"situationsTooltipSingular\"),\n\t\t\tformatResult([ResourceModel.getText(\"situationsTooltipPlural\"), numberOfSituations], formatters.tooltip)\n\t\t);\n\n\t\t// 'press' handler\n\t\tconst onPress = fn(showPopover, [ref(\"$controller\"), ref(\"$event\"), oProps.situations.path]);\n\n\t\treturn xml`\n\t\t\t<Button xmlns=\"sap.m\" xmlns:core=\"sap.ui.core\" core:require=\"{rt: 'sap/fe/macros/internal/situations/Runtime'}\"\n\t\t\t\ttype=\"Attention\"\n\t\t\t\ticon=\"sap-icon://alert\"\n\t\t\t\tclass=\"sapUiTinyMarginBegin sapUiSizeCompact\"\n\t\t\t\ttext=\"${compileBinding(text)}\"\n\t\t\t\ttooltip=\"${compileBinding(tooltip)}\"\n\t\t\t\tvisible=\"${compileBinding(visible)}\"\n\t\t\t\tpress=\"${compileBinding(onPress)}\"\n\t\t\t/>`;\n\t}\n});\n\nexport default SituationsIndicator;\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["SituationsIndicator.ts"],"names":["SituationsIndicator","MacroMetadata","extend","name","namespace","metadata","stereotype","properties","entitySet","type","required","$kind","propertyPath","create","oProps","convertMetaModelContext","situations","entityType","annotations","FE","Situations","getTemplate","numberOfSituations","bindingExpression","path","visible","greaterThan","formatResult","formatters","isVisible","text","ifElse","tooltip","equal","ResourceModel","getText","onPress","fn","showPopover","ref","xml","compileBinding"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;;;;;;;;;;;AAyBA,MAAMA,mBAAmB,GAAGC,aAAa,CAACC,MAAd,CAAqB,4CAArB,EAAmE;AAC9F;AACD;AACA;AACCC,IAAAA,IAAI,EAAE,qBAJwF;;AAK9F;AACD;AACA;AACCC,IAAAA,SAAS,EAAE,wBARmF;;AAU9F;AACD;AACA;AACCC,IAAAA,QAAQ,EAAE;AACT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE,UAJH;;AAKT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE;AACXC,QAAAA,SAAS,EAAE;AACVC,UAAAA,IAAI,EAAE,sBADI;AAEVC,UAAAA,QAAQ,EAAE,IAFA;AAGVC,UAAAA,KAAK,EAAE;AAHG,SADA;AAOXC,QAAAA,YAAY,EAAE;AACbH,UAAAA,IAAI,EAAE,QADO;AAEbC,UAAAA,QAAQ,EAAE;AAFG;AAPH;AARH,KAboF;AAkC9FG,IAAAA,MAAM,EAAE,UAASC,MAAT,EAA6B;AAAA;;AACpC,UAAMN,SAAS,GAAGO,uBAAuB,CAACD,MAAM,CAACN,SAAR,CAAzC;AAEAM,MAAAA,MAAM,CAACE,UAAP,GAAoBR,SAApB,aAAoBA,SAApB,gDAAoBA,SAAS,CAAES,UAA/B,oFAAoB,sBAAuBC,WAA3C,qFAAoB,uBAAoCC,EAAxD,2DAAoB,uBAAwCC,UAA5D;AAEA,aAAON,MAAP;AACA,KAxC6F;AA0C9FO,IAAAA,WA1C8F,YA0ClFP,MA1CkF,EA0C9D;AAC/B,UAAI,CAACA,MAAM,CAACE,UAAZ,EAAwB;AACvB;AACA,OAH8B,CAG7B;;;AAEF,UAAMM,kBAAkB,GAAGC,iBAAiB,WAAIT,MAAM,CAACE,UAAP,CAAkBQ,IAAtB,4BAA5C,CAL+B,CAO/B;;AACA,UAAIC,OAAJ;;AACA,UAAI,CAACX,MAAM,CAACF,YAAZ,EAA0B;AACzB;AACAa,QAAAA,OAAO,GAAGC,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAArB;AACA,OAHD,MAGO;AACN;AACA;AACA;AACAG,QAAAA,OAAO,GAAGE,YAAY,CACrB,CAACL,kBAAD,EAAqBC,iBAAiB,CAAC,8BAAD,EAAiC,UAAjC,CAAtC,EAAoFT,MAAM,CAACF,YAA3F,CADqB,EAErBgB,UAAU,CAACC,SAFU,CAAtB;AAIA,OApB8B,CAsB/B;;;AACA,UAAMC,IAAI,GAAGC,MAAM,CAACL,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAAZ,EAAqCA,kBAArC,EAAyD,EAAzD,CAAnB,CAvB+B,CAyB/B;;AACA,UAAMU,OAAO,GAAGD,MAAM,CACrBE,KAAK,CAACX,kBAAD,EAAqB,CAArB,CADgB,EAErBY,aAAa,CAACC,OAAd,CAAsB,2BAAtB,CAFqB,EAGrBR,YAAY,CAAC,CAACO,aAAa,CAACC,OAAd,CAAsB,yBAAtB,CAAD,EAAmDb,kBAAnD,CAAD,EAAyEM,UAAU,CAACI,OAApF,CAHS,CAAtB,CA1B+B,CAgC/B;;AACA,UAAMI,OAAO,GAAGC,EAAE,CAACC,WAAD,EAAc,CAACC,GAAG,CAAC,aAAD,CAAJ,EAAqBA,GAAG,CAAC,QAAD,CAAxB,EAAoCzB,MAAM,CAACE,UAAP,CAAkBQ,IAAtD,CAAd,CAAlB;AAEA,aAAOgB,GAAP,waAKUC,cAAc,CAACX,IAAD,CALxB,EAMaW,cAAc,CAACT,OAAD,CAN3B,EAOaS,cAAc,CAAChB,OAAD,CAP3B,EAQWgB,cAAc,CAACL,OAAD,CARzB;AAUA;AAvF6F,GAAnE,CAA5B;SA0FepC,mB","sourceRoot":".","sourcesContent":["import { MacroMetadata } from \"sap/fe/macros\";\nimport ResourceModel from \"sap/fe/macros/ResourceModel\";\nimport Context from \"sap/ui/model/Context\";\nimport {\n\tbindingExpression,\n\tcompileBinding,\n\tequal,\n\tfn,\n\tformatResult,\n\tgreaterThan,\n\tifElse,\n\tref\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { xml } from \"sap/fe/macros/MacroRuntime\";\nimport { convertMetaModelContext } from \"sap/fe/core/converters/MetaModelConverter\";\nimport { NavigationProperty } from \"@sap-ux/annotation-converter\";\nimport { showPopover } from \"sap/fe/macros/internal/situations/Runtime\";\nimport { PathAnnotationExpression } from \"@sap-ux/vocabularies-types\";\nimport formatters from \"sap/fe/macros/internal/situations/Formatter\";\n\ntype PublicProperties = {\n\tentitySet: Context;\n\tpropertyPath?: string;\n};\n\ntype Properties = PublicProperties & { situations: PathAnnotationExpression<NavigationProperty> | undefined };\n\nconst SituationsIndicator = MacroMetadata.extend(\"sap.fe.macros.internal.SituationsIndicator\", {\n\t/**\n\t * Name\n\t */\n\tname: \"SituationsIndicator\",\n\t/**\n\t * Namespace\n\t */\n\tnamespace: \"sap.fe.macros.internal\",\n\n\t/**\n\t * Metadata\n\t */\n\tmetadata: {\n\t\t/**\n\t\t * Define macro stereotype for documentation\n\t\t */\n\t\tstereotype: \"xmlmacro\",\n\t\t/**\n\t\t * Properties.\n\t\t */\n\t\tproperties: {\n\t\t\tentitySet: {\n\t\t\t\ttype: \"sap.ui.model.Context\",\n\t\t\t\trequired: true,\n\t\t\t\t$kind: \"EntitySet\"\n\t\t\t},\n\n\t\t\tpropertyPath: {\n\t\t\t\ttype: \"string\",\n\t\t\t\trequired: false\n\t\t\t}\n\t\t}\n\t},\n\tcreate: function(oProps: Properties) {\n\t\tconst entitySet = convertMetaModelContext(oProps.entitySet);\n\n\t\toProps.situations = entitySet?.entityType?.annotations?.FE?.Situations;\n\n\t\treturn oProps;\n\t},\n\n\tgetTemplate(oProps: Properties) {\n\t\tif (!oProps.situations) {\n\t\t\treturn;\n\t\t} // do not provide a template if Situations are unsupported\n\n\t\tconst numberOfSituations = bindingExpression(`${oProps.situations.path}/SitnNumberOfInstances`);\n\n\t\t// Indicator visibility\n\t\tlet visible;\n\t\tif (!oProps.propertyPath) {\n\t\t\t// no propertyPath --> visibility depends on the number of situations only\n\t\t\tvisible = greaterThan(numberOfSituations, 0);\n\t\t} else {\n\t\t\t// propertyPath --> visibility depends on the number of situations and on the semantic key used for showing indicators\n\t\t\t// TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&'\n\t\t\t// (or the expression parser fails if &amp;&amp; is used instead). Could be expressed as a simple expression binding.\n\t\t\tvisible = formatResult(\n\t\t\t\t[numberOfSituations, bindingExpression(\"semanticKeyHasDraftIndicator\", \"internal\"), oProps.propertyPath],\n\t\t\t\tformatters.isVisible\n\t\t\t);\n\t\t}\n\n\t\t// Button text: the number of situations if there are multiple, the empty string otherwise\n\t\tconst text = ifElse(greaterThan(numberOfSituations, 1), numberOfSituations, \"\");\n\n\t\t// Button tooltip: \"There is one situation\" / \"There are <n> situations\"\n\t\tconst tooltip = ifElse(\n\t\t\tequal(numberOfSituations, 1),\n\t\t\tResourceModel.getText(\"situationsTooltipSingular\"),\n\t\t\tformatResult([ResourceModel.getText(\"situationsTooltipPlural\"), numberOfSituations], formatters.tooltip)\n\t\t);\n\n\t\t// 'press' handler\n\t\tconst onPress = fn(showPopover, [ref(\"$controller\"), ref(\"$event\"), oProps.situations.path]);\n\n\t\treturn xml`\n\t\t\t<Button xmlns=\"sap.m\" xmlns:core=\"sap.ui.core\" core:require=\"{rt: 'sap/fe/macros/internal/situations/Runtime'}\"\n\t\t\t\ttype=\"Attention\"\n\t\t\t\ticon=\"sap-icon://alert\"\n\t\t\t\tclass=\"sapUiTinyMarginBegin sapUiSizeCompact\"\n\t\t\t\ttext=\"${compileBinding(text)}\"\n\t\t\t\ttooltip=\"${compileBinding(tooltip)}\"\n\t\t\t\tvisible=\"${compileBinding(visible)}\"\n\t\t\t\tpress=\"${compileBinding(onPress)}\"\n\t\t\t/>`;\n\t}\n});\n\nexport default SituationsIndicator;\n"]}

package/packages/sap.fe.macros/src/sap/fe/macros/internal/SituationsIndicator.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/macros/MacroMetadata","sap/fe/macros/ResourceModel","sap/fe/core/helpers/BindingExpression","sap/fe/macros/MacroRuntime","sap/fe/core/converters/MetaModelConverter","sap/fe/macros/internal/situations/Runtime","sap/fe/macros/internal/situations/Formatter"],function(M,R,B,a,b,c,f){"use strict";var _;var s=c.showPopover;var d=b.convertMetaModelContext;var x=a.xml;var r=B.ref;var i=B.ifElse;var g=B.greaterThan;var e=B.formatResult;var h=B.fn;var j=B.equal;var k=B.compileBinding;var l=B.bindingExpression;function m(n,o){if(!o){o=n.slice(0);}return Object.freeze(Object.defineProperties(n,{raw:{value:Object.freeze(o)}}));}var S=M.extend("sap.fe.macros.internal.SituationsIndicator",{name:"SituationsIndicator",namespace:"sap.fe.macros.internal",metadata:{stereotype:"xmlmacro",properties:{entitySet:{type:"sap.ui.model.Context",required:true,$kind:"EntitySet"},propertyPath:{type:"string",required:false}}},create:function(p){var n;var o=d(p.entitySet);p.situations=(n=o.entityType.annotations.FE)===null||n===void 0?void 0:n.Situations;return p;},getTemplate:function(p){if(!p.situations){return;}var n=l("".concat(p.situations.path,"/SitnNumberOfInstances"));var v;if(!p.propertyPath){v=g(n,0);}else{v=e([n,l("semanticKeyHasDraftIndicator","internal"),p.propertyPath],f.isVisible);}var t=i(g(n,1),n,"");var o=i(j(n,1),R.getText("situationsTooltipSingular"),e([R.getText("situationsTooltipPlural"),n],f.tooltip));var q=h(s,[r("$controller"),r("$event"),p.situations.path]);return x(_||(_=m(["\n\t\t\t<Button xmlns=\"sap.m\" xmlns:core=\"sap.ui.core\" core:require=\"{rt: 'sap/fe/macros/internal/situations/Runtime'}\"\n\t\t\t\ttype=\"Attention\"\n\t\t\t\ticon=\"sap-icon://alert\"\n\t\t\t\tclass=\"sapUiTinyMarginBegin sapUiSizeCompact\"\n\t\t\t\ttext=\"","\"\n\t\t\t\ttooltip=\"","\"\n\t\t\t\tvisible=\"","\"\n\t\t\t\tpress=\"","\"\n\t\t\t/>"])),k(t),k(o),k(v),k(q));}});return S;},false);
+sap.ui.define(["sap/fe/macros/MacroMetadata","sap/fe/macros/ResourceModel","sap/fe/core/helpers/BindingExpression","sap/fe/macros/MacroRuntime","sap/fe/core/converters/MetaModelConverter","sap/fe/macros/internal/situations/Runtime","sap/fe/macros/internal/situations/Formatter"],function(M,R,B,a,b,c,f){"use strict";var _;var s=c.showPopover;var d=b.convertMetaModelContext;var x=a.xml;var r=B.ref;var i=B.ifElse;var g=B.greaterThan;var e=B.formatResult;var h=B.fn;var j=B.equal;var k=B.compileBinding;var l=B.bindingExpression;function m(n,o){if(!o){o=n.slice(0);}return Object.freeze(Object.defineProperties(n,{raw:{value:Object.freeze(o)}}));}var S=M.extend("sap.fe.macros.internal.SituationsIndicator",{name:"SituationsIndicator",namespace:"sap.fe.macros.internal",metadata:{stereotype:"xmlmacro",properties:{entitySet:{type:"sap.ui.model.Context",required:true,$kind:"EntitySet"},propertyPath:{type:"string",required:false}}},create:function(p){var n,o,q;var t=d(p.entitySet);p.situations=t===null||t===void 0?void 0:(n=t.entityType)===null||n===void 0?void 0:(o=n.annotations)===null||o===void 0?void 0:(q=o.FE)===null||q===void 0?void 0:q.Situations;return p;},getTemplate:function(p){if(!p.situations){return;}var n=l("".concat(p.situations.path,"/SitnNumberOfInstances"));var v;if(!p.propertyPath){v=g(n,0);}else{v=e([n,l("semanticKeyHasDraftIndicator","internal"),p.propertyPath],f.isVisible);}var t=i(g(n,1),n,"");var o=i(j(n,1),R.getText("situationsTooltipSingular"),e([R.getText("situationsTooltipPlural"),n],f.tooltip));var q=h(s,[r("$controller"),r("$event"),p.situations.path]);return x(_||(_=m(["\n\t\t\t<Button xmlns=\"sap.m\" xmlns:core=\"sap.ui.core\" core:require=\"{rt: 'sap/fe/macros/internal/situations/Runtime'}\"\n\t\t\t\ttype=\"Attention\"\n\t\t\t\ticon=\"sap-icon://alert\"\n\t\t\t\tclass=\"sapUiTinyMarginBegin sapUiSizeCompact\"\n\t\t\t\ttext=\"","\"\n\t\t\t\ttooltip=\"","\"\n\t\t\t\tvisible=\"","\"\n\t\t\t\tpress=\"","\"\n\t\t\t/>"])),k(t),k(o),k(v),k(q));}});return S;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/internal/SituationsIndicator.ts

@@ -1,4 +1,5 @@
-import { MacroMetadata, ResourceModel } from "sap/fe/macros";
+import { MacroMetadata } from "sap/fe/macros";
+import ResourceModel from "sap/fe/macros/ResourceModel";
 import Context from "sap/ui/model/Context";
 import {
 	bindingExpression,
@@ -61,7 +62,7 @@ const SituationsIndicator = MacroMetadata.extend("sap.fe.macros.internal.Situati
 	create: function(oProps: Properties) {
 		const entitySet = convertMetaModelContext(oProps.entitySet);
 
-		oProps.situations = entitySet.entityType.annotations.FE?.Situations;
+		oProps.situations = entitySet?.entityType?.annotations?.FE?.Situations;
 
 		return oProps;
 	},

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/FieldContent.fragment.xml

@@ -11,7 +11,9 @@
 	<template:if
 		test="{= ${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataField' ||
 		${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithUrl' ||
-		${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath' }"
+		${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath' ||
+		${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation' ||
+		${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithAction' }"
 	>
 		<template:then>
 			<template:with path="dataField>Value" var="property">

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/FieldStructure.fragment.xml

@@ -24,7 +24,8 @@
 							ID: 'sap/fe/core/helpers/StableIdHelper',
 							Property: 'sap/fe/core/templating/PropertyFormatters',
 							UI: 'sap/fe/core/templating/UIFormatters',
-							FieldTemplating: 'sap/fe/macros/field/FieldTemplating'
+							FieldTemplating: 'sap/fe/macros/field/FieldTemplating',
+							FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
 						 }"
 >
 	<template:if test="{= ${this>displayStyle}==='Avatar' || ${this>displayStyle}==='Contact' || ${this>displayStyle}==='Button' }">
@@ -40,7 +41,6 @@
 				<template:else>
 					<control:FieldWrapper
 						id="{this>fieldWrapperId}"
-						emptyIndicatorTrigger="{= FIELD.getEmptyIndicatorTrigger(${this>formatOptions/showEmptyIndicator},${this>valueBindingExpression}, ${this>text})}"
 						editMode="{this>editMode}"
 						visible="{this>visible}"
 						required="{this>requiredExpression}"
@@ -53,7 +53,17 @@
 						</control:contentDisplay>
 						<template:if test="{= ${this>editMode}!=='Display'  &amp;&amp; !!${this>editStyle}}">
 							<control:contentEdit>
-								<core:Fragment fragmentName="sap.fe.macros.internal.field.editStyle.{this>editStyle}" type="XML" />
+								<template:if test="{this>collaborationEnabled}">
+									<template:then>
+										<HBox width="100%">
+											<core:Fragment fragmentName="sap.fe.macros.internal.field.editStyle.{this>editStyle}" type="XML" />
+											<core:Fragment fragmentName="sap.fe.macros.internal.CollaborationAvatar" type="XML" />
+										</HBox>
+									</template:then>
+									<template:else>
+										<core:Fragment fragmentName="sap.fe.macros.internal.field.editStyle.{this>editStyle}" type="XML" />
+									</template:else>
+								</template:if>
 							</control:contentEdit>
 						</template:if>
 					</control:FieldWrapper>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/DataPoint.fragment.xml

@@ -25,7 +25,10 @@
 						metaPath="{dataPoint>}"
 						contextPath="{entitySet>}"
 					>
-						<internalMacro:formatOptions measureDisplayMode="{this>formatOptions/measureDisplayMode}" />
+						<internalMacro:formatOptions
+							measureDisplayMode="{this>formatOptions/measureDisplayMode}"
+							showEmptyIndicator="{this>formatOptions/showEmptyIndicator}"
+						/>
 					</internalMacro:DataPoint>
 				</control:contentTrue>
 				<control:contentFalse>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/ExpandableText.fragment.xml

@@ -15,5 +15,6 @@
 		text="{this>text}"
 		overflowMode="{this>formatOptions/textExpandBehaviorDisplay}"
 		maxCharacters="{this>formatOptions/textMaxCharactersDisplay}"
+		emptyIndicatorMode="{this>emptyIndicatorMode}"
 	/>
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/LabelSemanticKey.fragment.xml

@@ -27,6 +27,7 @@
 						press="FieldRuntime.pressLink"
 						ariaLabelledBy="{this>ariaLabelledBy}"
 						modelContextChange="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) ? 'FieldRuntime.LinkModelContextChange' : null }"
+						emptyIndicatorMode="{this>emptyIndicatorMode}"
 					>
 						<customData>
 							<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/Link.fragment.xml

@@ -3,8 +3,10 @@
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	template:require="{
-							MODEL: 'sap/ui/model/odata/v4/AnnotationHelper'
-						 }"
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		FIELD: 'sap/fe/macros/field/FieldHelper',
+		COMMON: 'sap/fe/macros/CommonHelper'
+	}"
 >
 	<template:if test="{= ${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath' }">
 		<template:then>
@@ -14,13 +16,44 @@
 				text="{this>text}"
 				press="{= 'FieldRuntime.onDataFieldWithNavigationPath(${$source>/}, $controller, \'' + ${dataField>Target/$NavigationPropertyPath} + '\')' }"
 				ariaLabelledBy="{this>ariaLabelledBy}"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
 			/>
 		</template:then>
+		<template:elseif test="{= ${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation' }">
+			<Link
+				visible="{this>displayVisible}"
+				text="{this>text}"
+				press="{= COMMON.getPressHandlerForDataFieldForIBN(${dataField>})}"
+				ariaLabelledBy="{this>ariaLabelledBy}"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
+			/>
+		</template:elseif>
+		<template:elseif test="{= ${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldWithAction' }">
+			<Link
+				visible="{this>displayVisible}"
+				text="{this>text}"
+				press="{= FIELD.getPressEventForDataFieldActionButton(${this>}, ${dataField>}) }"
+				ariaLabelledBy="{this>ariaLabelledBy}"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
+			/>
+		</template:elseif>
 		<template:elseif test="{property>$Path@com.sap.vocabularies.Communication.v1.IsEmailAddress}">
-			<Link visible="{this>displayVisible}" text="{this>text}" href="mailto:{property>@@MODEL.format}" ariaLabelledBy="{this>ariaLabelledBy}" />
+			<Link
+				visible="{this>displayVisible}"
+				text="{this>text}"
+				href="mailto:{property>@@MODEL.format}"
+				ariaLabelledBy="{this>ariaLabelledBy}"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
+			/>
 		</template:elseif>
 		<template:elseif test="{property>$Path@com.sap.vocabularies.Communication.v1.IsPhoneNumber}">
-			<Link visible="{this>displayVisible}" text="{this>text}" href="tel:{property>@@MODEL.format}" ariaLabelledBy="{this>ariaLabelledBy}" />
+			<Link
+				visible="{this>displayVisible}"
+				text="{this>text}"
+				href="tel:{property>@@MODEL.format}"
+				ariaLabelledBy="{this>ariaLabelledBy}"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
+			/>
 		</template:elseif>
 		<template:else>
 			<Link
@@ -30,6 +63,7 @@
 				wrapping="true"
 				target="_blank"
 				ariaLabelledBy="{this>ariaLabelledBy}"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
 			/>
 		</template:else>
 	</template:if>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/LinkWithQuickViewForm.fragment.xml

@@ -10,13 +10,13 @@
 						 }"
 >
 	<Link
-		log:retrieveTextFormValueList="{this>formatOptions/retrieveTextFromValueList}"
-		text="{= ${this>formatOptions/retrieveTextFromValueList} ? FIELD.retrieveTextFormValueList( ${this>entitySet}, ${propertyPath>}, ${this>formatOptions} ) : ${this>text} }"
+		text="{= ${this>formatOptions/retrieveTextFromValueList} ? FIELD.retrieveTextFromValueList( ${this>entitySet}, ${propertyPath>}, ${this>formatOptions} ) : ${this>text} }"
 		visible="{this>displayVisible}"
 		wrapping="true"
 		core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 		press="FieldRuntime.pressLink"
 		ariaLabelledBy="{this>ariaLabelledBy}"
+		emptyIndicatorMode="{this>emptyIndicatorMode}"
 	>
 
 		<customData>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/LinkWrapper.fragment.xml

@@ -18,13 +18,13 @@
 	>
 		<control:contentTrue>
 			<Link
-				log:retrieveTextFormValueList="{this>formatOptions/retrieveTextFromValueList}"
-				text="{= ${this>formatOptions/retrieveTextFromValueList} ? FIELD.retrieveTextFormValueList( ${this>entitySet}, ${propertyPath>}, ${this>formatOptions} ) : ${this>text} }"
+				text="{= ${this>formatOptions/retrieveTextFromValueList} ? FIELD.retrieveTextFromValueList( ${this>entitySet}, ${propertyPath>}, ${this>formatOptions} ) : ${this>text} }"
 				wrapping="true"
 				core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 				press="FieldRuntime.pressLink"
 				ariaLabelledBy="{this>ariaLabelledBy}"
 				modelContextChange="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) ? 'FieldRuntime.LinkModelContextChange' : null }"
+				emptyIndicatorMode="{this>emptyIndicatorMode}"
 			>
 				<customData>
 					<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
@@ -53,7 +53,7 @@
 			</Link>
 		</control:contentTrue>
 		<control:contentFalse>
-			<Text visible="{this>displayVisible}" text="{this>text}" />
+			<Text visible="{this>displayVisible}" text="{this>text}" emptyIndicatorMode="{this>emptyIndicatorMode}" />
 		</control:contentFalse>
 	</control:ConditionalWrapper>
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/MdcFieldWithValueHelp.fragment.xml

@@ -17,10 +17,8 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
-	xmlns:control="sap.fe.core.controls"
 	xmlns:mdc="sap.ui.mdc"
 	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
-	xmlns:macro="sap.fe.macros"
 	template:require="{
 							FIELD: 'sap/fe/macros/field/FieldHelper',
 							ID: 'sap/fe/core/helpers/StableIdHelper',
@@ -42,6 +40,7 @@
 		fieldHelp="{= ${valueHelpProperty>@@Property.hasValueHelp} ? ValueHelpTemplating.generateID(${this>_vhFlexId},${this>vhIdPrefix},${property>@@Property.getRelativePropertyPath},${valueHelpProperty>@@Property.getRelativePropertyPath}) : undefined}"
 		textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 		ariaLabelledBy="{this>ariaLabelledBy}"
+		showEmptyIndicator="{this>formatOptions/showEmptyIndicator}"
 	>
 	</mdc:Field>
 

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/ObjectIdentifier.fragment.xml

@@ -3,16 +3,60 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
+	template:require="{
+		FIELD: 'sap/fe/macros/field/FieldHelper'
+	}"
 >
-	<template:if test="{this>addSituationsIndicator}">
-		<template:then>
-			<HBox alignItems="Center" width="100%">
-			<core:Fragment fragmentName="sap.fe.macros.internal.field.fragments.ObjectIdentifierContent" type="XML" />
-			<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" propertyPath="{property>$Path}" />
-			</HBox>
-		</template:then>
-		<template:else>
-			<core:Fragment fragmentName="sap.fe.macros.internal.field.fragments.ObjectIdentifierContent" type="XML" />
-		</template:else>
-	</template:if>
+    <template:if test="{this>addSituationsIndicator}">
+        <template:then>
+            <template:if test="{= ${entitySet>$kind} === 'NavigationProperty'}">
+                <template:then>
+                    <VBox>
+                        <HBox alignItems="Center" width="100%">
+                            <core:Fragment fragmentName="sap.fe.macros.internal.field.fragments.ObjectIdentifierContent" type="XML" />
+                            <internal:SituationsIndicator
+								xmlns:internal="sap.fe.macros.internal"
+								entitySet="{entitySet>}"
+								propertyPath="{property>$Path}"
+							/>
+                        </HBox>
+                        <ObjectStatus
+							visible="{this>formatOptions/containsErrorVisibility}"
+							class="sapUiSmallMarginBottom"
+							text="{parts : [{path: 'this.i18n>Contains_Errors'}], formatter: 'FIELD.formatErrorStatusText'}"
+							state="Error"
+						/>
+                    </VBox>
+                </template:then>
+                <template:else>
+                    <HBox alignItems="Center" width="100%">
+                        <core:Fragment fragmentName="sap.fe.macros.internal.field.fragments.ObjectIdentifierContent" type="XML" />
+                        <internal:SituationsIndicator
+							xmlns:internal="sap.fe.macros.internal"
+							entitySet="{entitySet>}"
+							propertyPath="{property>$Path}"
+						/>
+                    </HBox>
+                </template:else>
+            </template:if>
+        </template:then>
+        <template:else>
+            <template:if test="{= ${entitySet>$kind} === 'NavigationProperty'}">
+                <template:then>
+                    <VBox>
+                        <core:Fragment fragmentName="sap.fe.macros.internal.field.fragments.ObjectIdentifierContent" type="XML" />
+                        <ObjectStatus
+							visible="{this>formatOptions/containsErrorVisibility}"
+							class="sapUiSmallMarginBottom"
+							text="{parts : [{path: 'this.i18n>Contains_Errors'}], formatter: 'FIELD.formatErrorStatusText'}"
+							state="Error"
+						/>
+                    </VBox>
+                </template:then>
+                <template:else>
+                    <core:Fragment fragmentName="sap.fe.macros.internal.field.fragments.ObjectIdentifierContent" type="XML" />
+                </template:else>
+            </template:if>
+        </template:else>
+    </template:if>
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/SemanticKeyWithDraftIndicator.fragment.xml

@@ -23,7 +23,7 @@
 						<macro:DraftIndicator
 						DraftIndicatorType="IconAndText"
 						entitySet="{entitySet>}"
-						isDraftIndicatorVisible="{= '{parts: [{value: \'' + ${propertyPath>} + '\'}, {path: \'internal>semanticKeyHasDraftIndicator\'} , {path: \'HasDraftEntity\', targetType: \'any\'}, {path: \'IsActiveEntity\', targetType: \'any\'}, {path: \'pageInternal>hideDraftInfo\', targetType: \'any\'}] , formatter: \'.formatters.isDraftIndicatorVisible\'}' }"
+						isDraftIndicatorVisible="{='{parts: [{value: \'' + ${propertyPath>} + '\'}, {path: \'internal>semanticKeyHasDraftIndicator\'} , {path: \'HasDraftEntity\'}, {path: \'IsActiveEntity\'}, {path: \'pageInternal>hideDraftInfo\'}] , formatter: \'sap.fe.macros.field.FieldRuntime.isDraftIndicatorVisible\'}'}"
 						ariaLabelledBy="{this>ariaLabelledBy}"
 					/>
 				</VBox>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/Text.fragment.xml

@@ -12,7 +12,7 @@
 >
 	<template:if test="{= (${property>$Path/$Type} === 'Edm.String') &amp;&amp;	${property>$Path@com.sap.vocabularies.UI.v1.MultiLineText} }">
 		<template:then>
-			<Text visible="{this>displayVisible}" text="{this>text}" width="100%" />
+			<Text visible="{this>displayVisible}" text="{this>text}" width="100%" emptyIndicatorMode="{this>emptyIndicatorMode}" />
 		</template:then>
 		<template:elseif test="{= ${this>formatOptions/isAnalytics} &amp;&amp; ${property>@@Property.hasUnitOrCurrency} }">
 				<control:ConditionalWrapper
@@ -20,7 +20,7 @@
 				condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}"
 			>
 					<control:contentTrue>
-						<Text text="{this>text}" />
+						<Text text="{this>text}" emptyIndicatorMode="{this>emptyIndicatorMode}" />
 					</control:contentTrue>
 					<control:contentFalse>
 						<Text text="*" />
@@ -28,7 +28,7 @@
 				</control:ConditionalWrapper>
 		</template:elseif>
 		<template:else>
-			<Text visible="{this>displayVisible}" text="{this>text}" />
+			<Text visible="{this>displayVisible}" text="{this>text}" emptyIndicatorMode="{this>emptyIndicatorMode}" />
 		</template:else>
 	</template:if>
 

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/editStyle/DatePicker.fragment.xml

@@ -9,7 +9,8 @@
 							COMMON: 'sap/fe/macros/CommonHelper',
 							FIELD: 'sap/fe/macros/field/FieldHelper',
 							ID: 'sap/fe/core/helpers/StableIdHelper',
-							UI: 'sap/fe/core/templating/UIFormatters'
+							UI: 'sap/fe/core/templating/UIFormatters',
+							FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
 						 }"
 >
 	<DatePicker
@@ -27,6 +28,12 @@
 		textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 		validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
 		ariaLabelledBy="{this>ariaLabelledBy}"
-	/>
+	>
+		<template:if test="{this>collaborationEnabled}">
+			<layoutData>
+				<FlexItemData growFactor="9" />
+			</layoutData>
+		</template:if>
+	</DatePicker>
 
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/editStyle/DateTimePicker.fragment.xml

@@ -9,7 +9,8 @@
 							COMMON: 'sap/fe/macros/CommonHelper',
 							FIELD: 'sap/fe/macros/field/FieldHelper',
 							ID: 'sap/fe/core/helpers/StableIdHelper',
-							UI: 'sap/fe/core/templating/UIFormatters'
+							UI: 'sap/fe/core/templating/UIFormatters',
+							FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
 						 }"
 >
 
@@ -28,6 +29,12 @@
 		textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 		validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
 		ariaLabelledBy="{this>ariaLabelledBy}"
-	/>
+	>
+		<template:if test="{this>collaborationEnabled}">
+			<layoutData>
+				<FlexItemData growFactor="9" />
+			</layoutData>
+		</template:if>
+	</DateTimePicker>
 
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/editStyle/Input.fragment.xml

@@ -3,15 +3,18 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns="sap.m"
+	xmlns:f="sap.f"
 	xmlns:core="sap.ui.core"
 	template:require="{
 							MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 							COMMON: 'sap/fe/macros/CommonHelper',
 							FIELD: 'sap/fe/macros/field/FieldHelper',
 							ID: 'sap/fe/core/helpers/StableIdHelper',
-							UI: 'sap/fe/core/templating/UIFormatters'
+							UI: 'sap/fe/core/templating/UIFormatters',
+							FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
 						 }"
 >
+
 	<Input
 		unittest:id="MacroInput"
 		log:sourcePath="{this>dataSourcePath}"
@@ -24,10 +27,16 @@
 		enabled="{this>enabledExpression}"
 		required="{this>requiredExpression}"
 		change="FieldRuntime.handleChange($controller, $event)"
+		liveChange="{= ${this>collaborationEnabled} ? 'FieldRuntime.handleLiveChange' : undefined}"
 		fieldGroupIds="{parts:[{path:'dataField>Value/$Path'}, {path:'entityType>'}], formatter: 'FIELD.getFieldGroupIds'}"
 		textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 		validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
 		ariaLabelledBy="{this>ariaLabelledBy}"
-	/>
-
+	>
+		<template:if test="{this>collaborationEnabled}">
+			<layoutData>
+				<FlexItemData growFactor="9" />
+			</layoutData>
+		</template:if>
+	</Input>
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/editStyle/InputWithUnit.fragment.xml

@@ -10,7 +10,8 @@
 							FIELD: 'sap/fe/macros/field/FieldHelper',
 							ID: 'sap/fe/core/helpers/StableIdHelper',
 							UI: 'sap/fe/core/templating/UIFormatters',
-							FieldTemplating: 'sap/fe/macros/field/FieldTemplating'
+							FieldTemplating: 'sap/fe/macros/field/FieldTemplating',
+							FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
 						 }"
 >
 
@@ -28,14 +29,20 @@
 				enabled="{this>enabledExpression}"
 				required="{this>requiredExpression}"
 				change="FieldRuntime.handleChange($controller, $event)"
+				liveChange="{= ${this>collaborationEnabled} ? 'FieldRuntime.handleLiveChange' : undefined}"
 				textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 				fieldGroupIds="{parts:[{path:'dataField>Value/$Path'}, {path:'entityType>'}], formatter: 'FIELD.getFieldGroupIds'}"
 				validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
-			/>
+			>
+				<template:if test="{this>collaborationEnabled}">
+					<layoutData>
+						<FlexItemData growFactor="9" />
+					</layoutData>
+				</template:if>
+			</Input>
 		</template:then>
 		<template:else>
 			<template:with path="property>$Path@" helper="FIELD.getUnitOrCurrency" var="unit">
-
 				<Input
 					log:sourcePath="{this>dataSourcePath}"
 					core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
@@ -48,10 +55,17 @@
 					enabled="{this>enabledExpression}"
 					required="{this>requiredExpression}"
 					change="FieldRuntime.handleChange($controller, $event)"
+					liveChange="{= ${this>collaborationEnabled} ? 'FieldRuntime.handleLiveChange' : undefined}"
 					textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 					fieldGroupIds="{parts:[{path:'dataField>Value/$Path'}, {path:'entityType>'}], formatter: 'FIELD.getFieldGroupIds'}"
 					validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
-				/>
+				>
+					<template:if test="{this>collaborationEnabled}">
+						<layoutData>
+							<FlexItemData growFactor="9" />
+						</layoutData>
+					</template:if>
+				</Input>
 				<template:if test="{= (${this>formatOptions/measureDisplayMode} !== 'Hidden')}">
 					<template:then>
 						<Input
@@ -63,11 +77,18 @@
 							editable="{= (${this>formatOptions/measureDisplayMode} === 'ReadOnly' ? 'false' : 'true') }"
 							enabled="{this>enabledExpression}"
 							change="FieldRuntime.handleChange($controller, $event)"
+							liveChange="{= ${this>collaborationEnabled} ? 'FieldRuntime.handleLiveChange' : undefined}"
 							textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 							fieldGroupIds="{parts:[{path:'dataField>Value/$Path'}, {path:'entityType>'}], formatter: 'FIELD.getFieldGroupIds'}"
 							validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
 							visible="{= UI.ifUnitEditable(${property>@@UI.getConverterContext},true,false)}"
-						/>
+						>
+							<template:if test="{this>collaborationEnabled}">
+								<layoutData>
+									<FlexItemData growFactor="9" />
+								</layoutData>
+							</template:if>
+						</Input>
 					</template:then>
 				</template:if>
 			</template:with>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/editStyle/InputWithValueHelp.fragment.xml

@@ -28,7 +28,9 @@
 							ID: 'sap/fe/core/helpers/StableIdHelper',
 							UI: 'sap/fe/core/templating/UIFormatters',
 							ValueHelpTemplating: 'sap/fe/macros/internal/valuehelp/ValueHelpTemplating',
-							Property: 'sap/fe/core/templating/PropertyFormatters'
+							Property: 'sap/fe/core/templating/PropertyFormatters',
+							FE_MODEL: 'sap/fe/core/helpers/ModelHelper',
+							FieldTemplating: 'sap/fe/macros/field/FieldTemplating'
 	}"
 >
 
@@ -45,10 +47,11 @@
 		required="{this>requiredExpression}"
 		additionalValue="{this>textBindingExpression}"
 		display="{= UI.getFieldDisplay(${property>@@UI.getConverterContext}, ${this>formatOptions/displayMode}, ${this>editModeAsObject})}"
-		multipleLines="{= FIELD.getMultipleLinesForDataField(${this>}, ${property>$Path/$Type}, ${property>$Path@com.sap.vocabularies.UI.v1.MultiLineText}) }"
+		multipleLines="{= FieldTemplating.getMultipleLinesForDataField(${this>}, ${property>$Path/$Type}, ${property>$Path@com.sap.vocabularies.UI.v1.MultiLineText}) }"
 		fieldHelp="{= ${valueHelpProperty>@@Property.hasValueHelp} ? ValueHelpTemplating.generateID(${this>_vhFlexId},${this>vhIdPrefix},${property>@@Property.getRelativePropertyPath},${valueHelpProperty>@@Property.getRelativePropertyPath}) : undefined}"
 		fieldGroupIds="{parts:[{path:'dataField>Value/$Path'}, {path:'entityType>'}], formatter: 'FIELD.getFieldGroupIds'}"
 		change="FieldRuntime.handleChange($controller, $event)"
+		liveChange="{= ${this>collaborationEnabled} ? 'FieldRuntime.handleLiveChange' : undefined}"
 		textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
 		validateFieldGroup="FieldRuntime.onValidateFieldGroup($controller, $event)"
 		ariaLabelledBy="{this>ariaLabelledBy}"
@@ -68,6 +71,11 @@
 				/>
 			</mdc:contentEdit>
 		</template:if>
+		<template:if test="{this>collaborationEnabled}">
+			<mdc:layoutData>
+				<FlexItemData growFactor="9" />
+			</mdc:layoutData>
+		</template:if>
 	</mdc:Field>
 
 </core:FragmentDefinition>