Skip to content

Commit 8eab40c

Browse files
committed
Fix the #34 issue [2];
First approach was incorrect; ToDo: cover custom renderers with tests.
1 parent 08030c7 commit 8eab40c

File tree

4 files changed

+44
-14
lines changed

4 files changed

+44
-14
lines changed

dist/Thumb.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ var _Track = _interopRequireDefault(require("./Track"));
1313

1414
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1515

16-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
17-
1816
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1917

18+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
19+
20+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
21+
2022
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
2123

2224
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -160,12 +162,16 @@ function (_React$Component) {
160162
props.className = "thumb " + (type === TYPE_X ? "thumbX" : "thumbY") + (className ? " " + className : "");
161163
props.onMouseDown = this.handleDragStart;
162164

163-
props.ref = function (ref) {
164-
typeof elementRef === "function" && elementRef(ref);
165-
_this2.element = ref;
165+
var ref = function ref(_ref) {
166+
typeof elementRef === "function" && elementRef(_ref);
167+
_this2.element = _ref;
166168
};
167169

168-
return renderer ? renderer(props) : _react.default.createElement("div", props);
170+
return renderer ? renderer(_objectSpread({}, props, {
171+
elementRef: ref
172+
})) : _react.default.createElement("div", _extends({}, props, {
173+
ref: ref
174+
}));
169175
}
170176
}]);
171177

dist/Track.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
1313

1414
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1515

16+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
17+
18+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
19+
1620
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
1721

1822
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -84,12 +88,16 @@ function (_React$Component) {
8488
props.className = "track " + (type === TYPE_X ? "trackX" : "trackY") + (className ? " " + className : "");
8589
props.onClick = this.onClickHandler;
8690

87-
props.ref = function (ref) {
88-
typeof elementRef === "function" && elementRef(ref);
89-
_this2.element = ref;
91+
var ref = function ref(_ref) {
92+
typeof elementRef === "function" && elementRef(_ref);
93+
_this2.element = _ref;
9094
};
9195

92-
return renderer ? renderer(props) : _react.default.createElement("div", props);
96+
return renderer ? renderer(_objectSpread({}, props, {
97+
elementRef: ref
98+
})) : _react.default.createElement("div", _extends({}, props, {
99+
ref: ref
100+
}));
93101
}
94102
}]);
95103

src/Thumb.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,19 @@ export default class Thumb extends React.Component {
109109

110110
props.className = "thumb " + (type === TYPE_X ? "thumbX" : "thumbY") + (className ? " " + className : "");
111111
props.onMouseDown = this.handleDragStart;
112-
props.ref = ref => {
112+
113+
const ref = ref => {
113114
typeof elementRef === "function" && elementRef(ref);
114115
this.element = ref;
115116
};
116117

117-
return renderer ? renderer(props) : <div {...props} />;
118+
return renderer ? (
119+
renderer({
120+
...props,
121+
elementRef: ref,
122+
})
123+
) : (
124+
<div {...props} ref={ref} />
125+
);
118126
}
119127
}

src/Track.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,19 @@ export default class Track extends React.Component {
3939

4040
props.className = "track " + (type === TYPE_X ? "trackX" : "trackY") + (className ? " " + className : "");
4141
props.onClick = this.onClickHandler;
42-
props.ref = ref => {
42+
43+
const ref = ref => {
4344
typeof elementRef === "function" && elementRef(ref);
4445
this.element = ref;
4546
};
4647

47-
return renderer ? renderer(props) : <div {...props} />;
48+
return renderer ? (
49+
renderer({
50+
...props,
51+
elementRef: ref,
52+
})
53+
) : (
54+
<div {...props} ref={ref} />
55+
);
4856
}
4957
}

0 commit comments

Comments
 (0)