@openui5/sap.ui.rta 1.100.0 → 1.102.1

package/src/sap/ui/rta/util/changeVisualization/categories/MoveVisualization.js

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils"
+	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils",
+	"sap/ui/core/util/reflection/JsControlTreeModifier"
 ], function(
-	ChangeVisualizationUtils
+	ChangeVisualizationUtils,
+	JsControlTreeModifier
 ) {
 	"use strict";
 
@@ -19,14 +21,30 @@ sap.ui.define([
 	 *
 	 * @param {object} mPayload - Change visualization payload from the change handler
 	 * @param {string} sLabel - Change handler label
+	 * @param {object} mPropertyBag - Additional properties
 	 * @returns {object} Localized description text and button text
 	 */
-	MoveVisualization.getDescription = function (mPayload, sLabel) {
+	MoveVisualization.getDescription = function(mPayload, sLabel, mPropertyBag) {
 		var oRtaResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-		var sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", ChangeVisualizationUtils.shortenString(sLabel));
-		var sDescriptionTooltip = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", sLabel);
-		var sButtonText = oRtaResourceBundle.getText("BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_MOVE");
-		return { descriptionText: sDescriptionText, descriptionTooltip: sDescriptionTooltip, buttonText: sButtonText};
+		var sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE_WITHIN", ChangeVisualizationUtils.shortenString(sLabel));
+		var sDescriptionTooltip = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE_WITHIN", sLabel);
+		var sButtonText;
+		var oAppComponent = mPropertyBag.appComponent;
+		var sSourceParentId = (
+			mPayload.sourceParentContainer
+			&& JsControlTreeModifier.getControlIdBySelector(mPayload.sourceParentContainer, oAppComponent)
+		);
+		var sTargetParentId = (
+			mPayload.targetParentContainer
+			&& JsControlTreeModifier.getControlIdBySelector(mPayload.targetParentContainer, oAppComponent)
+		);
+
+		if (sSourceParentId !== sTargetParentId) {
+			sButtonText = oRtaResourceBundle.getText("BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_MOVE");
+			sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", ChangeVisualizationUtils.shortenString(sLabel));
+			sDescriptionTooltip = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", sLabel);
+		}
+		return { descriptionText: sDescriptionText, descriptionTooltip: sDescriptionTooltip, buttonText: sButtonText };
 	};
 
 	return MoveVisualization;

package/src/sap/ui/rta/themes/sap_hcb/Toolbar.standalone.less

@@ -1,9 +0,0 @@
-/* type: standalone */
-.sapUiRtaToolbar.type_standalone.color_default .sapMBtn .sapMBtnContent,
-.sapUiRtaToolbar.type_standalone.color_default .sapMBtn .sapMBtnTransparent .sapMBtnIcon {
-	color: inherit;
-	}
-	.sapUiRtaToolbar.type_standalone.color_default .sapMBtn.sapMBtnDisabled .sapMBtnContent,
-	.sapUiRtaToolbar.type_standalone.color_default .sapMBtn.sapMBtnDisabled .sapMBtnIcon {
-		color: inherit;
-		}