orc-shared 5.10.0-dev.10 → 5.10.0-dev.12

package/dist/components/AppFrame/About.js

@@ -70,7 +70,7 @@ var AboutParagraph = exports.AboutParagraph = _styledComponents.default.p.withCo
 var AboutLink = exports.AboutLink = _styledComponents.default.a.withConfig({
   displayName: "About__AboutLink",
   componentId: "sc-1y9zgcc-2"
-})(["color:#23527c;text-decoration:none;"]);
+})(["color:#337ab7;text-decoration:none;"]);
 var getClickOutsideHandler = exports.getClickOutsideHandler = function getClickOutsideHandler(_ref, updateViewState) {
   var show = _ref.show;
   return show ? function (event) {

package/dist/components/MaterialUI/DataDisplay/TooltippedElements/MultipleLinesText.js

@@ -66,7 +66,7 @@ var MultipleLinesText = function MultipleLinesText(_ref) {
     }
   }, [isClamped, setIsClamped]);
   return /*#__PURE__*/_react.default.createElement(TooltippedTextClamp, {
-    disableCssClamp: true,
+    disableCssClamp: false,
     clamp: lineCount,
     className: (0, _classnames.default)(classes.clampedText, customStyles),
     children: children.toString(),

package/dist/components/MaterialUI/hocs/withDeferredTooltip.js

@@ -55,7 +55,9 @@ var withDeferredTooltip = function withDeferredTooltip(Comp) {
       if (alwaysDisplay) {
         setShouldBeTooltipped(true);
       } else {
-        setShouldBeTooltipped(event.target.offsetWidth < event.target.scrollWidth);
+        setShouldBeTooltipped(event.target.offsetWidth < event.target.scrollWidth ||
+        // for single line
+        event.target.scrollHeight > event.target.clientHeight); // for multiple lines
       }
     };
     if (titleValue == null) return /*#__PURE__*/_react.default.createElement(Comp, props);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.10.0-dev.10",
+	"version": "5.10.0-dev.12",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/components/AppFrame/About.js

@@ -77,7 +77,7 @@ export const AboutParagraph = styled.p`
 `;
 
 export const AboutLink = styled.a`
-	color: #23527c;
+	color: #337ab7;
 	text-decoration: none;
 `;
 
@@ -86,7 +86,7 @@ export const getClickOutsideHandler = ({ show }, updateViewState) => {
 		? event => {
 				event.stopPropagation();
 				updateViewState("show", false);
-		  }
+			}
 		: () => {};
 };
 
@@ -117,7 +117,7 @@ export const About = ({ currentApplication }) => {
 								key="application-version"
 								message={currentApplication.displayName.concat(" ", window.BUILD_NUMBER)}
 							/>,
-					  ]
+						]
 					: null}
 				{DEPENDENCIES && DEPENDENCIES["orc-shared"]
 					? [
@@ -129,7 +129,7 @@ export const About = ({ currentApplication }) => {
 									values: { version: trimStart(DEPENDENCIES["orc-shared"], "^") },
 								}}
 							/>,
-					  ]
+						]
 					: null}
 				{DEPENDENCIES && DEPENDENCIES["orc-scripts"]
 					? [
@@ -141,7 +141,7 @@ export const About = ({ currentApplication }) => {
 									values: { version: trimStart(DEPENDENCIES["orc-scripts"], "^") },
 								}}
 							/>,
-					  ]
+						]
 					: null}
 				{DEPENDENCIES && DEPENDENCIES["orc-secret"]
 					? [
@@ -153,7 +153,7 @@ export const About = ({ currentApplication }) => {
 									values: { version: trimStart(DEPENDENCIES["orc-secret"], "^") },
 								}}
 							/>,
-					  ]
+						]
 					: null}
 			</AboutParagraph>
 			<AboutParagraph long>

package/src/components/MaterialUI/DataDisplay/PredefinedElements/InformationItem.test.js

@@ -126,9 +126,6 @@ describe("Information Item", () => {
 		const label = "label";
 		const value = "value";
 
-		const multipleLinesTextProps = new TextProps();
-		multipleLinesTextProps.set(TextProps.propNames.lineCount, 2);
-
 		const component = (
 			<IntlProvider locale="en-US">
 				<InformationItem label={label} isMaxLineCountEnabled={null}>
@@ -140,7 +137,7 @@ describe("Information Item", () => {
 		const expected = (
 			<div>
 				<Typography children={label} />
-				<MultipleLinesText textProps={multipleLinesTextProps}>{value}</MultipleLinesText>
+				<MultipleLinesText>{value}</MultipleLinesText>
 			</div>
 		);
 

package/src/components/MaterialUI/DataDisplay/TooltippedElements/MultipleLinesText.js

@@ -41,7 +41,7 @@ const MultipleLinesText = ({ children, titleValue, textProps, tooltipClasses })
 
 	return (
 		<TooltippedTextClamp
-			disableCssClamp={true}
+			disableCssClamp={false}
 			clamp={lineCount}
 			className={classNames(classes.clampedText, customStyles)}
 			children={children.toString()}

package/src/components/MaterialUI/DataDisplay/TooltippedElements/MultipleLinesText.test.js

@@ -17,7 +17,7 @@ describe("MultipleLinesText", () => {
 
 		const mountedComponent = mount(component);
 		const expected = (
-			<TextClamp disableCssClamp={true} clamp={lineCount}>
+			<TextClamp disableCssClamp={false} clamp={lineCount}>
 				{text}
 			</TextClamp>
 		);

package/src/components/MaterialUI/hocs/withDeferredTooltip.js

@@ -17,7 +17,10 @@ const withDeferredTooltip =
 			if (alwaysDisplay) {
 				setShouldBeTooltipped(true);
 			} else {
-				setShouldBeTooltipped(event.target.offsetWidth < event.target.scrollWidth);
+				setShouldBeTooltipped(
+					event.target.offsetWidth < event.target.scrollWidth || // for single line
+						event.target.scrollHeight > event.target.clientHeight,
+				); // for multiple lines
 			}
 		};
 

package/src/components/MaterialUI/hocs/withDeferredTooltip.test.js

@@ -47,6 +47,33 @@ describe("withDeferredTooltip", () => {
 		expect(mountedTooltippedComponent.containsMatchingElement(expected), "to be true");
 	});
 
+	it("Wraps passed component in Mui tooltip if mouse enter event was triggered and scrollHeight is bigger than clientHeight", () => {
+		const Wrapper = props => <ComponentToBeTooltipped {...props} />;
+
+		const TooltippedCompponent = withDeferredTooltip(Wrapper);
+
+		const mountedTooltippedComponent = shallow(<TooltippedCompponent titleValue="test" />);
+
+		const event = {
+			target: {
+				offsetWidth: 0,
+				scrollWidth: 0,
+				scrollHeight: 200,
+				clientHeight: 100,
+			},
+		};
+
+		mountedTooltippedComponent.find(Wrapper).invoke("onMouseEnter")(event);
+
+		let expected = (
+			<MuiTooltip>
+				<Wrapper />
+			</MuiTooltip>
+		);
+
+		expect(mountedTooltippedComponent.containsMatchingElement(expected), "to be true");
+	});
+
 	it("Does not wrap passed component in Mui tooltip if scrollWidth is same as offsetWidth", () => {
 		const Wrapper = props => <ComponentToBeTooltipped {...props} />;