@plusscommunities/pluss-core-app 1.4.8 → 1.5.2

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "@plusscommunities/pluss-core-app",
-  "version": "1.4.8",
+  "version": "1.5.2",
   "description": "Core extension package for Pluss Communities platform",
-  "main": "src/index.js",
+  "main": "dist/module/index.js",
+  "module": "dist/module/index.js",
+  "react-native": "src/index.js",
+  "files": [
+    "dist/",
+    "src/"
+  ],
   "scripts": {
-    "prepatch": "npm version prepatch --preid=beta",
+    "build": "bob build",
+    "betapatch": "npm version prepatch --preid=beta",
     "patch": "npm version patch",
-    "preupload": "npm publish --access public --tag beta && rm -rf node_modules",
-    "preupload:p": "npm run prepatch && npm run preupload",
-    "upload": "npm publish --access public && rm -rf node_modules",
+    "betaupload": "npm run build && npm publish --access public --tag beta",
+    "betaupload:p": "npm run betapatch && npm run betaupload",
+    "upload": "npm run build && npm publish --access public",
     "upload:p": "npm run patch && npm run upload"
   },
   "author": "Phillip Suh",
@@ -43,10 +50,20 @@
     "react-native-vimeo-iframe": "^1.0.4",
     "react-native-webview": "11.15.0",
     "react-native-youtube-iframe": "^2.2.1",
-    "react-redux": "^5.0.5"
+    "react-redux": "^7.2.6"
   },
   "peerDependencies": {
     "react-native-gifted-chat": "^0.16.3",
     "axios": "^0.16.2"
+  },
+  "devDependencies": {
+    "react-native-builder-bob": "^0.18.2"
+  },
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "dist",
+    "targets": [
+      "module"
+    ]
   }
 }

package/src/components/CommentReply.js

@@ -29,7 +29,7 @@ class CommentReply extends Component {
   componentDidMount() {
     if (this.props.commentSection && this.props.commentSection.current) {
       this.setState({
-        commentsLoading: this.props.commentSection.current.getWrappedInstance().isLoading(),
+        commentsLoading: this.props.commentSection.current.isLoading(),
       });
     }
   }
@@ -94,13 +94,13 @@ class CommentReply extends Component {
     });
     Keyboard.dismiss();
     if (this.props.commentSection) {
-      this.props.commentSection?.current?.getWrappedInstance().startedAddingComment();
+      this.props.commentSection?.current?.startedAddingComment();
     }
     reactionActions
       .addComment(this.props.entityId, this.props.entityType, this.props.entityName, this.props.site, text, image, this.props.threadId)
       .then(res => {
         if (this.props.commentSection) {
-          this.props.commentSection?.current?.getWrappedInstance().commentAdded(res.data);
+          this.props.commentSection?.current?.commentAdded(res.data);
         }
         this.setState({
           addingComment: false,
@@ -182,11 +182,9 @@ class CommentReply extends Component {
 
   render() {
     if (_.includes(this.props.user.hidden, 'addComment')) {
-      console.log('no way');
       return null;
     }
     if (this.state.commentsLoading) {
-      console.log('still loading');
       return null;
     }
     return (

package/src/components/CommentSection.js

@@ -179,7 +179,7 @@ class CommentSection extends Component {
         commentsLoadStarted: true,
         commentsLoading: true,
       });
-      this.props.commentReply?.current?.getWrappedInstance().loadingStarted();
+      this.props.commentReply?.current?.loadingStarted();
 
       this.loadComments();
     }
@@ -221,7 +221,7 @@ class CommentSection extends Component {
         },
       );
       //if (this.props.commentReply) {
-      this.props.commentReply?.current?.getWrappedInstance().loadingCompleted();
+      this.props.commentReply?.current?.loadingCompleted();
       //}
       if (this.props.live) {
         this.loadTimer = setTimeout(() => {
@@ -231,9 +231,9 @@ class CommentSection extends Component {
     });
   }
 
-  isLoading() {
+  isLoading = () => {
     return this.state.commentsLoading;
-  }
+  };
 
   startedAddingComment() {
     this.setState({

package/src/components/MediaPlayer.js

@@ -4,7 +4,7 @@ import * as ScreenOrientation from 'expo-screen-orientation';
 import { DeviceMotion } from 'expo-sensors';
 import YoutubePlayer, { getYoutubeMeta } from 'react-native-youtube-iframe';
 import { Vimeo } from 'react-native-vimeo-iframe';
-import WebView from 'react-native-webview';
+import { WebView } from 'react-native-webview';
 import { Video } from 'expo-av';
 import VideoPlayer from 'expo-video-player';
 import { Spinner } from './Spinner';
@@ -259,14 +259,14 @@ class MediaPlayer extends Component {
     </View>
   );
 
-  getWebviewPlayer = embedUrl => (
+  getWebviewPlayer = (embedUrl, width, height) => (
     <WebView
       startInLoadingState
       javaScriptEnabled
       scrollEnabled={false}
       automaticallyAdjustContentInsets={false}
       mediaPlaybackRequiresUserAction
-      style={styles.webView}
+      style={[styles.webView, { width, height }]}
       source={{ uri: embedUrl }}
     />
   );
@@ -333,23 +333,28 @@ class MediaPlayer extends Component {
       if (isYoutube) {
         const youtubeId = this.getYoutubeVideoId(source);
         embedUrl = youtubeId ? `https://www.youtube.com/embed/${youtubeId}` : source;
+        // console.log('getYoutubePlayer', youtubeId, width, height, autoPlay);
         player = this.getYoutubePlayer(youtubeId, width, height, autoPlay);
       } else if (isVimeo) {
         const vimeoId = this.getVimeoId(source);
         embedUrl = source;
+        // console.log('getVimeoPlayer', vimeoId, width, height, autoPlay);
         player = this.getVimeoPlayer(vimeoId, width, height, autoPlay);
       } else if (playbackId) {
         embedUrl = this.getStreamPlaybackUrl();
+        // console.log('getStreamPlayer', embedUrl, width, height, autoPlay);
         player = this.getStreamPlayer(embedUrl, width, height, autoPlay);
         showLoading = true;
       } else if (useVideoPlayer) {
         embedUrl = source;
+        // console.log('getVideoPlayer', embedUrl, width, height, autoPlay);
         player = this.getVideoPlayer(embedUrl, width, height, autoPlay);
       }
     }
     if (!player && isUrlLink) {
       embedUrl = source;
-      player = this.getWebviewPlayer(embedUrl);
+      console.log('getWebviewPlayer', embedUrl, width, height);
+      player = this.getWebviewPlayer(embedUrl, width, height);
     }
 
     // console.log({
@@ -361,6 +366,10 @@ class MediaPlayer extends Component {
     //   Width: width,
     //   Height: height,
     //   HeightFactor: heightFactor,
+    //   isYoutube,
+    //   isVimeo,
+    //   playbackId,
+    //   useVideoPlayer,
     // });
     return (
       <View style={styles.container}>
@@ -377,6 +386,7 @@ class MediaPlayer extends Component {
 
 const styles = StyleSheet.create({
   container: {
+    flex: 1,
     backgroundColor: '#000',
     alignItems: 'center',
     justifyContent: 'center',

package/src/components/VideoPopup.js

@@ -4,7 +4,7 @@ import * as ScreenOrientation from 'expo-screen-orientation';
 import { StatusBarHeight, getCompressed, imageExists } from '../helper';
 import { Pl60Icon } from '../fonts';
 import { SharingTools } from './SharingTools';
-import { MediaPlayer } from './MediaPlayer';
+import MediaPlayer from './MediaPlayer';
 
 class VideoPopup extends Component {
   constructor(props) {

package/src/constants.js

@@ -5,10 +5,10 @@ const HEADER_HEIGHT = 70;
 
 // const getFooterIcons = () => {
 //   return {
-//     events: require(`../../assets/icons/footer/whats-on.png`),
-//     foryou: require(`../../assets/icons/footer/hub.png`),
-//     friends: require(`../../assets/icons/footer/people.png`),
-//     home: require(`../../assets/icons/footer/home.png`),
+//     events: require(`./assets/icons/footer/whats-on.png`),
+//     foryou: require(`./assets/icons/footer/hub.png`),
+//     friends: require(`./assets/icons/footer/people.png`),
+//     home: require(`./assets/icons/footer/home.png`),
 //   };
 // };
 

package/src/helper.js

@@ -287,19 +287,19 @@ const getReactions = () => {
   return [
     {
       key: 'heart',
-      icon: require('../assets/icons/reactions/heart.png'),
+      icon: require('./assets/icons/reactions/heart.png'),
     },
     {
       key: 'smile',
-      icon: require('../assets/icons/reactions/smile.png'),
+      icon: require('./assets/icons/reactions/smile.png'),
     },
     {
       key: 'sad',
-      icon: require('../assets/icons/reactions/sad.png'),
+      icon: require('./assets/icons/reactions/sad.png'),
     },
     {
       key: 'party',
-      icon: require('../assets/icons/reactions/party.png'),
+      icon: require('./assets/icons/reactions/party.png'),
     },
   ];
 };