@desynova-digital/player 4.0.59 → 4.0.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/components/MarkerBar.js
CHANGED
|
@@ -40,10 +40,10 @@ var propTypes = {
|
|
|
40
40
|
var defaultProps = {
|
|
41
41
|
player: {}
|
|
42
42
|
};
|
|
43
|
-
var MarkerBlock = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: 100%;\n height: 25px;\n position: ", ";\n bottom: ", ";\n .marker {\n position: absolute;\n width: 2px;\n height: 20px;\n p {\n font-family: SFUIText-Medium;\n font-size: 10px;\n color: #ffffff;\n position: absolute;\n left: 50%;\n transform: translateX(-50%);\n }\n ", " {\n position: absolute;\n display: block;\n left: 50%;\n top: 10px;\n transform: translateX(-50%);\n }\n }\n"])), function (props) {
|
|
43
|
+
var MarkerBlock = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: 100%;\n height: 25px;\n z-index:3;\n position: ", ";\n bottom: ", ";\n .marker {\n position: absolute;\n width: 2px;\n height: 20px;\n p {\n font-family: SFUIText-Medium;\n font-size: 10px;\n color: #ffffff;\n position: absolute;\n left: 50%;\n transform: translateX(-50%);\n }\n ", " {\n position: absolute;\n display: block;\n left: 50%;\n top: 10px;\n transform: translateX(-50%);\n }\n }\n"])), function (props) {
|
|
44
44
|
return props.controlType === 'advanced' && !props.isFullscreen ? 'relative' : 'absolute';
|
|
45
45
|
}, function (props) {
|
|
46
|
-
return props.controlType === 'advanced' && !props.isFullscreen ? '0px' : '
|
|
46
|
+
return props.controlType === 'advanced' && !props.isFullscreen ? '0px' : '10px';
|
|
47
47
|
}, _components.Icon.Element);
|
|
48
48
|
var MarkerBar = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
49
49
|
function MarkerBar(props) {
|
package/components/Slider.js
CHANGED
|
@@ -66,7 +66,7 @@ var defaultProps = {
|
|
|
66
66
|
valuenow: '',
|
|
67
67
|
valuetext: ''
|
|
68
68
|
};
|
|
69
|
-
var SliderBlock = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: relative;\n z-index: 2;\n width: 100%;\n height:
|
|
69
|
+
var SliderBlock = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: relative;\n z-index: 2;\n width: 100%;\n height: 100%;\n background: ", ";\n"])), function (props) {
|
|
70
70
|
return props.theme ? " ".concat(_tokens.colors[props.theme].base) : '#121d29';
|
|
71
71
|
});
|
|
72
72
|
var Slider = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
@@ -14,6 +14,7 @@ var _SeekBar = _interopRequireDefault(require("./SeekBar"));
|
|
|
14
14
|
var _PointersBar = _interopRequireDefault(require("../PointersBar"));
|
|
15
15
|
var _colors = _interopRequireDefault(require("../../colors"));
|
|
16
16
|
var _player = _interopRequireDefault(require("../../reducers/player"));
|
|
17
|
+
var _MarkerBar = _interopRequireDefault(require("../MarkerBar"));
|
|
17
18
|
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
|
|
18
19
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
19
20
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
@@ -59,7 +60,7 @@ var SeekControlBar = _styledComponents["default"].div(_templateObject2 || (_temp
|
|
|
59
60
|
var MarkerTagsBlock = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n min-width: 100px;\n max-width: 100px;\n position: relative;\n height: 60px;\n .empty-block {\n height: calc(100% - 20px);\n }\n .tags-block {\n height: 20px;\n font-family: SFUIText-Medium;\n font-size: 12px;\n color: #ffffff;\n text-transform: uppercase;\n border-top: 1px solid #333333;\n border-bottom: 1px solid #333333;\n p {\n line-height: 18px;\n padding-left: 10px;\n }\n }\n"])));
|
|
60
61
|
var ScrollStyledDiv = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n max-height: 101px;\n position: relative;\n top: ", ";\n overflow-y: ", ";\n overflow-x: ", ";\n"])), function (_ref3) {
|
|
61
62
|
var markers = _ref3.markers;
|
|
62
|
-
return markers.length > 3 ? '
|
|
63
|
+
return markers.length > 3 ? '15px' : '14px';
|
|
63
64
|
}, function (_ref4) {
|
|
64
65
|
var markers = _ref4.markers;
|
|
65
66
|
return markers.length > 3 ? 'hidden' : 'visible';
|
|
@@ -152,7 +153,8 @@ var ProgressControl = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
152
153
|
isFullscreen = _this$props2$player.isFullscreen,
|
|
153
154
|
duration = _this$props2$player.duration,
|
|
154
155
|
markers = _this$props2.markers,
|
|
155
|
-
theme = _this$props2.theme
|
|
156
|
+
theme = _this$props2.theme,
|
|
157
|
+
zoom = _this$props2.zoom;
|
|
156
158
|
var _this$state = this.state,
|
|
157
159
|
mouseTime = _this$state.mouseTime,
|
|
158
160
|
stateZoom = _this$state.stateZoom;
|
|
@@ -166,7 +168,9 @@ var ProgressControl = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
166
168
|
ref: function ref(c) {
|
|
167
169
|
_this2.progressControlBlock = c;
|
|
168
170
|
}
|
|
169
|
-
},
|
|
171
|
+
}, playerType == 'default' && /*#__PURE__*/_react["default"].createElement(_MarkerBar["default"], _extends({}, this.props, {
|
|
172
|
+
zoom: zoom
|
|
173
|
+
})), controlType === 'advanced' && !isFullscreen && duration ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(CoverDiv, null), /*#__PURE__*/_react["default"].createElement(ScrollStyledDiv, {
|
|
170
174
|
markers: markers,
|
|
171
175
|
ref: this.parentScrollDivRef,
|
|
172
176
|
className: "hide-scrollbar"
|
|
@@ -35,7 +35,7 @@ function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.fre
|
|
|
35
35
|
// import MouseTimeDisplay from './MouseTimeDisplay';
|
|
36
36
|
|
|
37
37
|
var AdvancedControlBlock = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n width: 100%;\n height: 46px;\n position: relative;\n cursor: pointer;\n z-index: 1;\n"])));
|
|
38
|
-
var SliderBlock = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: 100%;\n height:
|
|
38
|
+
var SliderBlock = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: 100%;\n height: 4px;\n position: relative;\n cursor: pointer;\n z-index: 2;\n"])));
|
|
39
39
|
var propTypes = {
|
|
40
40
|
actions: _propTypes.PropTypes.instanceOf(Object),
|
|
41
41
|
player: _propTypes.PropTypes.instanceOf(Object),
|
|
@@ -189,6 +189,17 @@ var SeekBar = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
189
189
|
var actions = this.props.actions;
|
|
190
190
|
actions.replay(0.04);
|
|
191
191
|
}
|
|
192
|
+
}, {
|
|
193
|
+
key: "returnStyle",
|
|
194
|
+
value: function returnStyle(PT) {
|
|
195
|
+
if (PT == 'default') {
|
|
196
|
+
return {
|
|
197
|
+
height: '14px',
|
|
198
|
+
cursor: 'pointer'
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
return {};
|
|
202
|
+
}
|
|
192
203
|
}, {
|
|
193
204
|
key: "render",
|
|
194
205
|
value: function render() {
|
|
@@ -207,9 +218,10 @@ var SeekBar = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
207
218
|
var time = seekingTime || currentTime;
|
|
208
219
|
return /*#__PURE__*/_react["default"].createElement("span", {
|
|
209
220
|
id: "seekbarss"
|
|
210
|
-
}, /*#__PURE__*/_react["default"].createElement(_MarkerBar["default"], _extends({}, this.props, {
|
|
221
|
+
}, playerType != 'default' && /*#__PURE__*/_react["default"].createElement(_MarkerBar["default"], _extends({}, this.props, {
|
|
211
222
|
zoom: zoom
|
|
212
223
|
})), tagsMarker && tagsMarker.length ? /*#__PURE__*/_react["default"].createElement(_TagsBar["default"], this.props) : null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
224
|
+
style: this.returnStyle(playerType),
|
|
213
225
|
onMouseDown: this.handleMouseDown,
|
|
214
226
|
onMouseMove: this.handleMouseMove,
|
|
215
227
|
onMouseUp: this.handleMouseUp
|