Merge pull request #190 from kealjones-wk/resize-sensor-merged-styles

Add ability to override wrapper styles on resize-sensor
Workiva · Oct 22, 2018 · 906cc1e · 906cc1e
2 parents cab3368 + fb92b92
commit 906cc1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/src/component/resize_sensor.dart b/lib/src/component/resize_sensor.dart
@@ -248,10 +248,13 @@ class ResizeSensorComponent extends UiComponent<ResizeSensorProps> with _SafeAni
       wrapperStyles = _wrapperStyles;;
     }
 
+    var mergedStyle = newStyleFromProps(props);
+    mergedStyle = {}..addAll(wrapperStyles)..addAll(mergedStyle);
+
     return (Dom.div()
       ..addProps(copyUnconsumedDomProps())
       ..className = forwardingClassNameBuilder().toClassName()
-      ..style = wrapperStyles
+      ..style = mergedStyle
     )(
       props.children,
       resizeSensor

diff --git a/test/over_react/component/resize_sensor_test.dart b/test/over_react/component/resize_sensor_test.dart
@@ -169,6 +169,14 @@ void main() {
           expect(nodeStyleDecl.getPropertyValue('flex'), '1 1 0%');
         }
       });
+
+      test('when overridden by consumer', () {
+        var renderedNode = renderAndGetDom((ResizeSensor()..style = {'width':'auto','height':'auto'})());
+
+        expect(renderedNode.style.position, equals('relative'));
+        expect(renderedNode.style.width, equals('auto'));
+        expect(renderedNode.style.height, equals('auto'));
+      });
     });
 
     // Test that every last ResizeSensor node is hidden with both visibility and opacity,