Skip to content

Commit f5b0a4c

Browse files
author
Pete Browne
committed
fix(OverlayViewCreator): position container after render
* Closes #167
1 parent 693c956 commit f5b0a4c

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

lib/creators/OverlayViewCreator.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ var OverlayViewCreator = (function (_Component) {
104104
};
105105

106106
overlayView.draw = function draw() {
107-
this._renderContent();
108107
this._mountContainerToPane();
109-
this._positionContainerElement();
108+
this._renderContent();
110109
};
111110

112111
overlayView.onRemove = function onRemove() {
@@ -116,16 +115,17 @@ var OverlayViewCreator = (function (_Component) {
116115
};
117116

118117
overlayView._redraw = function _redraw(mapPaneNameChanged) {
119-
this._renderContent();
120118
if (mapPaneNameChanged) {
121119
this._unmountContainerFromPane();
122120
this._mountContainerToPane();
123121
}
124-
this._positionContainerElement();
122+
this._renderContent();
125123
};
126124

127125
overlayView._renderContent = function _renderContent() {
128-
(0, _reactDom.render)(_react.Children.only(this.get("children")), this._containerElement);
126+
if (this._containerElement) {
127+
(0, _reactDom.render)(_react.Children.only(this.get("children")), this._containerElement, this._positionContainerElement.bind(this));
128+
}
129129
};
130130

131131
overlayView._mountContainerToPane = function _mountContainerToPane() {

src/creators/OverlayViewCreator.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ export default class OverlayViewCreator extends Component {
5353
};
5454

5555
overlayView.draw = function draw() {
56-
this._renderContent();
5756
this._mountContainerToPane();
58-
this._positionContainerElement();
57+
this._renderContent();
5958
};
6059

6160
overlayView.onRemove = function onRemove() {
@@ -65,19 +64,21 @@ export default class OverlayViewCreator extends Component {
6564
};
6665

6766
overlayView._redraw = function _redraw(mapPaneNameChanged) {
68-
this._renderContent();
6967
if (mapPaneNameChanged) {
7068
this._unmountContainerFromPane();
7169
this._mountContainerToPane();
7270
}
73-
this._positionContainerElement();
71+
this._renderContent();
7472
};
7573

7674
overlayView._renderContent = function _renderContent() {
77-
render(
78-
Children.only(this.get(`children`)),
79-
this._containerElement
80-
);
75+
if (this._containerElement) {
76+
render(
77+
Children.only(this.get(`children`)),
78+
this._containerElement,
79+
this._positionContainerElement.bind(this)
80+
);
81+
}
8182
};
8283

8384
overlayView._mountContainerToPane = function _mountContainerToPane() {

0 commit comments

Comments
 (0)