From 402cc8b0b1164b07e8812d67867835702a4b803d Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Wed, 26 Sep 2018 13:42:30 -0700 Subject: [PATCH 1/6] Initial react-native-dom support --- dom/RCTVideo.js | 107 +++++++++++++++++++++++++++++++++++++++++ dom/RCTVideoManager.js | 52 ++++++++++++++++++++ dom/index.js | 3 ++ dom/resizeModes.js | 8 +++ dom/types.js | 10 ++++ 5 files changed, 180 insertions(+) create mode 100644 dom/RCTVideo.js create mode 100644 dom/RCTVideoManager.js create mode 100644 dom/index.js create mode 100644 dom/resizeModes.js create mode 100644 dom/types.js diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js new file mode 100644 index 0000000000..fa09011e20 --- /dev/null +++ b/dom/RCTVideo.js @@ -0,0 +1,107 @@ +// @flow + +import { RCTView, type RCTBridge } from "react-native-dom"; + +import resizeModes from "./resizeModes"; +import type { VideoSource } from "./types"; + +class RCTVideo extends RCTView { + playPromise: Promise = Promise.resolve(); + videoElement: HTMLVideoElement; + + _paused: boolean = false; + + constructor(bridge: RCTBridge) { + super(bridge); + + this.videoElement = this.initializeVideoElement(); + this.muted = true; + this.childContainer.appendChild(this.videoElement); + } + + initializeVideoElement() { + const elem = document.createElement("video"); + + Object.assign(elem.style, { + display: "block", + position: "absolute", + top: "0", + left: "0", + width: "100%", + height: "100%", + }); + + return elem; + } + + set source(value: VideoSource) { + let uri = value.uri; + + if (uri.startsWith("blob:")) { + let blob = this.bridge.blobManager.resolveURL(uri); + if (blob.type === "text/xml") { + blob = new Blob([blob], { type: "video/mp4" }); + } + uri = URL.createObjectURL(blob); + } + + this.videoElement.setAttribute("src", uri); + if (!this._paused) { + this.playPromise = this.videoElement.play(); + } + } + + set muted(value: boolean) { + if (value) { + this.videoElement.setAttribute("muted", "true"); + this.videoElement.muted = true; + } else { + this.videoElement.removeAttribute("muted"); + this.videoElement.muted = false; + } + } + + set repeat(value: boolean) { + if (value) { + this.videoElement.setAttribute("loop", "true"); + } else { + this.videoElement.removeAttribute("loop"); + } + } + + set resizeMode(value: number) { + switch (value) { + case resizeModes.ScaleNone: { + this.videoElement.style.objectFit = "none"; + break; + } + case resizeModes.ScaleToFill: { + this.videoElement.style.objectFit = "fill"; + break; + } + case resizeModes.ScaleAspectFit: { + this.videoElement.style.objectFit = "contain"; + break; + } + case resizeModes.ScaleAspectFill: { + this.videoElement.style.objectFit = "cover"; + break; + } + } + } + + set paused(value: boolean) { + this.playPromise.then(() => { + if (value) { + this.videoElement.pause(); + } else { + this.playPromise = this.videoElement.play().catch(console.error); + } + }); + this._paused = value; + } +} + +customElements.define("rct-video", RCTVideo); + +export default RCTVideo; diff --git a/dom/RCTVideoManager.js b/dom/RCTVideoManager.js new file mode 100644 index 0000000000..4b615ac39a --- /dev/null +++ b/dom/RCTVideoManager.js @@ -0,0 +1,52 @@ +// @flow + +import { RCTViewManager } from "react-native-dom"; + +import RCTVideo from "./RCTVideo"; +import resizeModes from "./resizeModes"; + +import type { VideoSource } from "./types"; + +class RCTVideoManager extends RCTViewManager { + static moduleName = "RCTVideoManager"; + + view() { + return new RCTVideo(this.bridge); + } + + describeProps() { + return super + .describeProps() + .addObjectProp("src", this.setSource) + .addNumberProp("resizeMode", this.setResizeMode) + .addBooleanProp("repeat", this.setRepeat) + .addBooleanProp("paused", this.setPaused) + .addBooleanProp("muted", this.setMuted); + } + + setSource(view: RCTVideo, value: VideoSource) { + view.source = value; + } + + setResizeMode(view: RCTVideo, value: number) { + view.resizeMode = value; + } + + setRepeat(view: RCTVideo, value: boolean) { + view.repeat = value; + } + + setPaused(view: RCTVideo, value: boolean) { + view.paused = value; + } + + setMuted(view: RCTVideo, value: boolean) { + view.muted = value; + } + + constantsToExport() { + return { ...resizeModes }; + } +} + +export default RCTVideoManager; diff --git a/dom/index.js b/dom/index.js new file mode 100644 index 0000000000..d68d5bba8b --- /dev/null +++ b/dom/index.js @@ -0,0 +1,3 @@ +// @flow + +module.exports = require("./RCTVideoManager"); diff --git a/dom/resizeModes.js b/dom/resizeModes.js new file mode 100644 index 0000000000..5f569e0dee --- /dev/null +++ b/dom/resizeModes.js @@ -0,0 +1,8 @@ +// @flow + +export default { + ScaleNone: 0, + ScaleToFill: 1, + ScaleAspectFit: 2, + ScaleAspectFill: 3, +}; diff --git a/dom/types.js b/dom/types.js new file mode 100644 index 0000000000..fe1d1a155e --- /dev/null +++ b/dom/types.js @@ -0,0 +1,10 @@ +// @flow + +export type VideoSource = { + uri: string, + type: string, + mainVer: number, + patchVer: number, + isNetwork: boolean, + isAsset: boolean, +}; From 3132adeb72af8f6cab2f17fcef7d338a6928491e Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Wed, 26 Sep 2018 16:35:27 -0700 Subject: [PATCH 2/6] Add install instructions for react-native-dom --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index c1dd0f0ffe..73c3d34bb8 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,31 @@ using System.Collections.Generic; ``` +
+ DOM + +Make the following additions to the given files manually: + +**dom/bootstrap.js** + +Import RCTVideoManager and add it to the list of nativeModules: + +```javascript +import { RNDomInstance } from "react-native-dom"; +import { name as appName } from "../app.json"; +import RCTVideoManager from 'react-native-video/dom/RCTVideoManager'; // Add this + +// Path to RN Bundle Entrypoint ================================================ +const rnBundlePath = "./entry.bundle?platform=dom&dev=true"; + +// React Native DOM Runtime Options ============================================= +const ReactNativeDomOptions = { + enableHotReload: false, + nativeModules: [RCTVideoManager] // Add this +}; +``` +
+ ## Usage ```javascript From bf6aa6aa2617f045b2f752a6f19eeee943aa6f0d Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Wed, 26 Sep 2018 16:35:47 -0700 Subject: [PATCH 3/6] Implement most props --- dom/RCTVideo.js | 72 ++++++++++++++++++++++++++++-------------- dom/RCTVideoManager.js | 37 ++++++++++++++-------- 2 files changed, 73 insertions(+), 36 deletions(-) diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js index fa09011e20..18df09b151 100644 --- a/dom/RCTVideo.js +++ b/dom/RCTVideo.js @@ -15,7 +15,10 @@ class RCTVideo extends RCTView { super(bridge); this.videoElement = this.initializeVideoElement(); - this.muted = true; + this.controls = false; + this.muted = false; + this.rate = 1.0; + this.volume = 1.0; this.childContainer.appendChild(this.videoElement); } @@ -34,20 +37,13 @@ class RCTVideo extends RCTView { return elem; } - set source(value: VideoSource) { - let uri = value.uri; - - if (uri.startsWith("blob:")) { - let blob = this.bridge.blobManager.resolveURL(uri); - if (blob.type === "text/xml") { - blob = new Blob([blob], { type: "video/mp4" }); - } - uri = URL.createObjectURL(blob); - } - - this.videoElement.setAttribute("src", uri); - if (!this._paused) { - this.playPromise = this.videoElement.play(); + set controls(value: boolean) { + if (value) { + this.videoElement.setAttribute("controls", "true"); + this.videoElement.controls = true; + } else { + this.videoElement.removeAttribute("controls"); + this.videoElement.controls = false; } } @@ -61,6 +57,21 @@ class RCTVideo extends RCTView { } } + set paused(value: boolean) { + this.playPromise.then(() => { + if (value) { + this.videoElement.pause(); + } else { + this.playPromise = this.videoElement.play().catch(console.error); + } + }); + this._paused = value; + } + + set rate(value: number) { + this.videoElement.setAttribute("playbackRate", value); + } + set repeat(value: boolean) { if (value) { this.videoElement.setAttribute("loop", "true"); @@ -90,15 +101,30 @@ class RCTVideo extends RCTView { } } - set paused(value: boolean) { - this.playPromise.then(() => { - if (value) { - this.videoElement.pause(); - } else { - this.playPromise = this.videoElement.play().catch(console.error); + set source(value: VideoSource) { + let uri = value.uri; + + if (uri.startsWith("blob:")) { + let blob = this.bridge.blobManager.resolveURL(uri); + if (blob.type === "text/xml") { + blob = new Blob([blob], { type: "video/mp4" }); } - }); - this._paused = value; + uri = URL.createObjectURL(blob); + } + + this.videoElement.setAttribute("src", uri); + if (!this._paused) { + this.playPromise = this.videoElement.play(); + } + } + + set volume(value: number) { + this.videoElement.setAttribute("volume", value); + if (this.value === 0) { + this.muted = true; + } else { + this.muted = false; + } } } diff --git a/dom/RCTVideoManager.js b/dom/RCTVideoManager.js index 4b615ac39a..c34a9ee404 100644 --- a/dom/RCTVideoManager.js +++ b/dom/RCTVideoManager.js @@ -17,31 +17,42 @@ class RCTVideoManager extends RCTViewManager { describeProps() { return super .describeProps() - .addObjectProp("src", this.setSource) - .addNumberProp("resizeMode", this.setResizeMode) - .addBooleanProp("repeat", this.setRepeat) + .addBooleanProp("controls", this.setControls) + .addBooleanProp("muted", this.setMuted) .addBooleanProp("paused", this.setPaused) - .addBooleanProp("muted", this.setMuted); + .addBooleanProp("rate", this.setRate) + .addBooleanProp("repeat", this.setRepeat) + .addNumberProp("resizeMode", this.setResizeMode) + .addObjectProp("src", this.setSource) + .addNumberProp("volume", this.setVolume); } - setSource(view: RCTVideo, value: VideoSource) { - view.source = value; + setControls(view: RCTVideo, value: boolean) { + view.controls = value; } - setResizeMode(view: RCTVideo, value: number) { - view.resizeMode = value; + setMuted(view: RCTVideo, value: boolean) { + view.muted = value; + } + + setPaused(view: RCTVideo, value: boolean) { + view.paused = value; + } + + setRate(view: RCTVideo, value: number) { + view.rate = value; } setRepeat(view: RCTVideo, value: boolean) { view.repeat = value; } - - setPaused(view: RCTVideo, value: boolean) { - view.paused = value; + + setResizeMode(view: RCTVideo, value: number) { + view.resizeMode = value; } - setMuted(view: RCTVideo, value: boolean) { - view.muted = value; + setSource(view: RCTVideo, value: VideoSource) { + view.source = value; } constantsToExport() { From 53b7275b8063f4b4020ea395eb2556a0c50a2267 Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Wed, 26 Sep 2018 17:03:37 -0700 Subject: [PATCH 4/6] Make rate work on Chrome --- dom/RCTVideo.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js index 18df09b151..b4ce251170 100644 --- a/dom/RCTVideo.js +++ b/dom/RCTVideo.js @@ -69,7 +69,10 @@ class RCTVideo extends RCTView { } set rate(value: number) { + this.videoElement.setAttribute("defaultPlaybackRate", value); this.videoElement.setAttribute("playbackRate", value); + this.videoElement.defaultPlaybackRate = value; // playbackRate doesn't work on Chrome + this.videoElement.playbackRate = value; } set repeat(value: boolean) { From 88c8ea7ea0b47e1c359b7f863dce3aa091798fd7 Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Wed, 26 Sep 2018 17:09:13 -0700 Subject: [PATCH 5/6] Add license --- dom/LICENSE.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 dom/LICENSE.md diff --git a/dom/LICENSE.md b/dom/LICENSE.md new file mode 100644 index 0000000000..aa185c82ad --- /dev/null +++ b/dom/LICENSE.md @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2018 Vincent Riemer + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 6bdbe4af0ee318b3d021034136acc04333706874 Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Thu, 27 Sep 2018 15:50:12 -0700 Subject: [PATCH 6/6] Implement common events --- dom/RCTVideo.js | 131 +++++++++++++++++++++++++++++++++++++---- dom/RCTVideoEvent.js | 56 ++++++++++++++++++ dom/RCTVideoManager.js | 18 +++++- 3 files changed, 192 insertions(+), 13 deletions(-) create mode 100644 dom/RCTVideoEvent.js diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js index b4ce251170..db6fc55e3c 100644 --- a/dom/RCTVideo.js +++ b/dom/RCTVideo.js @@ -1,27 +1,59 @@ // @flow -import { RCTView, type RCTBridge } from "react-native-dom"; +import { RCTEvent, RCTView, type RCTBridge } from "react-native-dom"; import resizeModes from "./resizeModes"; import type { VideoSource } from "./types"; +import RCTVideoEvent from "./RCTVideoEvent"; class RCTVideo extends RCTView { playPromise: Promise = Promise.resolve(); + progressTimer: number; videoElement: HTMLVideoElement; + onEnd: boolean = false; + onLoad: boolean = false; + onLoadStart: boolean = false; + onProgress: boolean = false; + _paused: boolean = false; + _progressUpdateInterval: number = 250.0; + _savedVolume: number = 1.0; constructor(bridge: RCTBridge) { super(bridge); + this.eventDispatcher = bridge.getModuleByName("EventDispatcher"); + + this.onEnd = this.onEnd.bind(this); + this.onLoad = this.onLoad.bind(this); + this.onLoadStart = this.onLoadStart.bind(this); + this.onPlay = this.onPlay.bind(this); + this.onProgress = this.onProgress.bind(this); + this.videoElement = this.initializeVideoElement(); - this.controls = false; + this.videoElement.addEventListener("ended", this.onEnd); + this.videoElement.addEventListener("loadeddata", this.onLoad); + this.videoElement.addEventListener("loadstart", this.onLoadStart); + this.videoElement.addEventListener("pause", this.onPause); + this.videoElement.addEventListener("play", this.onPlay); + this.muted = false; this.rate = 1.0; this.volume = 1.0; this.childContainer.appendChild(this.videoElement); } + detachFromView(view: UIView) { + this.videoElement.removeEventListener("ended", this.onEnd); + this.videoElement.removeEventListener("loadeddata", this.onLoad); + this.videoElement.removeEventListener("loadstart", this.onLoadStart); + this.videoElement.removeEventListener("pause", this.onPause); + this.videoElement.removeEventListener("play", this.onPlay); + + this.stopProgressTimer(); + } + initializeVideoElement() { const elem = document.createElement("video"); @@ -31,28 +63,31 @@ class RCTVideo extends RCTView { top: "0", left: "0", width: "100%", - height: "100%", + height: "100%" }); return elem; } + presentFullscreenPlayer() { + console.log("V PF"); + this.videoElement.webkitRequestFullScreen(); + } + set controls(value: boolean) { if (value) { - this.videoElement.setAttribute("controls", "true"); this.videoElement.controls = true; + this.videoElement.style.pointerEvents = "auto"; } else { - this.videoElement.removeAttribute("controls"); this.videoElement.controls = false; + this.videoElement.style.pointerEvents = ""; } } set muted(value: boolean) { if (value) { - this.videoElement.setAttribute("muted", "true"); this.videoElement.muted = true; } else { - this.videoElement.removeAttribute("muted"); this.videoElement.muted = false; } } @@ -68,9 +103,13 @@ class RCTVideo extends RCTView { this._paused = value; } + set progressUpdateInterval(value: number) { + this._progressUpdateInterval = value; + this.stopProgressTimer(); + this.startProgressTimer(); + } + set rate(value: number) { - this.videoElement.setAttribute("defaultPlaybackRate", value); - this.videoElement.setAttribute("playbackRate", value); this.videoElement.defaultPlaybackRate = value; // playbackRate doesn't work on Chrome this.videoElement.playbackRate = value; } @@ -104,6 +143,10 @@ class RCTVideo extends RCTView { } } + set seek(value: number) { + this.videoElement.currentTime = value; + } + set source(value: VideoSource) { let uri = value.uri; @@ -122,13 +165,79 @@ class RCTVideo extends RCTView { } set volume(value: number) { - this.videoElement.setAttribute("volume", value); - if (this.value === 0) { + if (value === 0) { this.muted = true; } else { + this.videoElement.volume = value; this.muted = false; } } + + onEnd = () => { + this.onProgress(); + this.sendEvent("topVideoEnd", null); + this.stopProgressTimer(); + } + + onLoad = () => { + // height & width are safe with audio, will be 0 + const height = this.videoElement.videoHeight; + const width = this.videoElement.videoWidth; + const payload = { + currentPosition: this.videoElement.currentTime, + duration: this.videoElement.duration, + naturalSize: { + width, + height, + orientation: width >= height ? "landscape" : "portrait" + } + }; + this.sendEvent("topVideoLoad", payload); + } + + onLoadStart = () => { + const src = this.videoElement.currentSrc; + const payload = { + isNetwork: !src.match(/^https?:\/\/localhost/), // require is served from localhost + uri: this.videoElement.currentSrc + }; + this.sendEvent("topVideoLoadStart", payload); + } + + onPause = () => { + this.stopProgressTimer(); + } + + onPlay = () => { + this.startProgressTimer(); + } + + onProgress = () => { + const payload = { + currentTime: this.videoElement.currentTime, + duration: this.videoElement.duration + }; + this.sendEvent("topVideoProgress", payload); + } + + sendEvent(eventName, payload) { + const event = new RCTVideoEvent(eventName, this.reactTag, 0, payload); + this.eventDispatcher.sendEvent(event); + } + + startProgressTimer() { + if (!this.progressTimer && this._progressUpdateInterval) { + this.onProgress(); + this.progressTimer = setInterval(this.onProgress, this._progressUpdateInterval); + } + } + + stopProgressTimer() { + if (this.progressTimer) { + clearInterval(this.progressTimer); + this.progressTimer = null; + } + } } customElements.define("rct-video", RCTVideo); diff --git a/dom/RCTVideoEvent.js b/dom/RCTVideoEvent.js new file mode 100644 index 0000000000..699a88c4a2 --- /dev/null +++ b/dom/RCTVideoEvent.js @@ -0,0 +1,56 @@ +// import { RCTEvent } from "react-native-dom"; + +interface RCTEvent { + viewTag: number; + eventName: string; + coalescingKey: number; + + canCoalesce(): boolean; + coalesceWithEvent(event: RCTEvent): RCTEvent; + + moduleDotMethod(): string; + arguments(): Array; + } + +export default class RCTVideoEvent implements RCTEvent { + viewTag: number; + eventName: string; + coalescingKey: number; + + constructor( + eventName: string, + reactTag: number, + coalescingKey: number, + data: ?Object + ) { + this.viewTag = reactTag; + this.eventName = eventName; + this.coalescingKey = coalescingKey; + this.data = data; + } + + canCoalesce(): boolean { + return false; + } + + coalesceWithEvent(event: RCTEvent): RCTEvent { + return; + } + + moduleDotMethod(): string { + return "RCTEventEmitter.receiveEvent"; + } + + arguments(): Array { + const args = [ + this.viewTag, + this.eventName, + this.data + ]; + return args; + } + + coalescingKey(): number { + return this.coalescingKey; + } +} diff --git a/dom/RCTVideoManager.js b/dom/RCTVideoManager.js index c34a9ee404..b5b3f3f3d6 100644 --- a/dom/RCTVideoManager.js +++ b/dom/RCTVideoManager.js @@ -20,11 +20,21 @@ class RCTVideoManager extends RCTViewManager { .addBooleanProp("controls", this.setControls) .addBooleanProp("muted", this.setMuted) .addBooleanProp("paused", this.setPaused) + .addNumberProp("progressUpdateInterval", this.setProgressUpdateInterval) .addBooleanProp("rate", this.setRate) .addBooleanProp("repeat", this.setRepeat) .addNumberProp("resizeMode", this.setResizeMode) + .addNumberProp("seek", this.setSeek) .addObjectProp("src", this.setSource) - .addNumberProp("volume", this.setVolume); + .addNumberProp("volume", this.setVolume) + .addDirectEvent("onVideoEnd") + .addDirectEvent("onVideoLoad") + .addDirectEvent("onVideoLoadStart") + .addDirectEvent("onVideoProgress"); + } + + presentFullscreenPlayer() { + // not currently working } setControls(view: RCTVideo, value: boolean) { @@ -46,11 +56,15 @@ class RCTVideoManager extends RCTViewManager { setRepeat(view: RCTVideo, value: boolean) { view.repeat = value; } - + setResizeMode(view: RCTVideo, value: number) { view.resizeMode = value; } + setSeek(view: RCTVideo, value: number) { + view.seek = value; + } + setSource(view: RCTVideo, value: VideoSource) { view.source = value; }