Merge release into master (#2141)

* v0.26.0-rc.5 * v0.26.0-rc.6 * v0.26.0-rc.7 * v0.26.0-rc.8 * v0.26.0-rc.9 * v0.26.0-rc.10 * daemon v0.30.1rc8 * v0.26.0-rc.11 * v0.26.0-rc.12 * v0.26.0-rc.13 * chore: bump rc and daemon rc * update lbry-redux * fix title wrapping * fix: md button color in dark mode * hide abandonded claims * fix: can't preview alignment * update lbry-redux * chore: bump daemon rc * chore: bump rc * chore: bump proper daemon 0.30.1!! * fix: CategoryList style * v0.26.0-rc.16 * re-add build:dir script * v0.26.0
lbryio · Dec 12, 2018 · 8fa5573 · 8fa5573
1 parent af25620
commit 8fa5573
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.26.0-rc.4",
+  "version": "0.26.0",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
@@ -23,6 +23,7 @@
     "extract-langs": "node build/extractLocals.js",
     "compile": "electron-webpack && yarn extract-langs",
     "build": "yarn compile && electron-builder build",
+    "build:dir": "yarn build -- --dir -c.compression=store -c.mac.identity=null",
     "dev": "electron-webpack dev",
     "lint": "eslint 'src/**/*.{js,jsx}' --fix && flow",
     "format": "prettier 'src/**/*.{js,jsx,scss,json}' --write",
@@ -133,7 +134,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.30.1rc7",
+    "lbrynetDaemonVersion": "0.30.1",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet"

diff --git a/src/renderer/component/categoryList/view.jsx b/src/renderer/component/categoryList/view.jsx
@@ -7,6 +7,7 @@ import ToolTip from 'component/common/tooltip';
 import FileCard from 'component/fileCard';
 import Button from 'component/button';
 import SubscribeButton from 'component/subscribeButton';
+import classnames from 'classnames';
 
 type Props = {
   category: string,
@@ -16,6 +17,7 @@ type Props = {
   channelClaims: ?Array<Claim>,
   fetchChannel: string => void,
   obscureNsfw: boolean,
+  isSubComponent: boolean,
 };
 
 type State = {
@@ -26,6 +28,7 @@ type State = {
 class CategoryList extends PureComponent<Props, State> {
   static defaultProps = {
     categoryLink: '',
+    isSubComponent: false,
   };
 
   constructor() {
@@ -207,14 +210,27 @@ class CategoryList extends PureComponent<Props, State> {
   }
 
   render() {
-    const { category, categoryLink, names, channelClaims, obscureNsfw } = this.props;
+    const {
+      category,
+      categoryLink,
+      names,
+      channelClaims,
+      obscureNsfw,
+      isSubComponent,
+    } = this.props;
     const { canScrollNext, canScrollPrevious } = this.state;
     const isCommunityTopBids = category.match(/^community/i);
     const showScrollButtons = isCommunityTopBids ? !obscureNsfw : true;
 
+    // isSubComponent is a hack, this component should be able to handle this with proper overflow styling
+
     return (
       <div className="card-row">
-        <div className="card-row__header">
+        <div
+          className={classnames('card-row__header', {
+            'card-row__header--sub-component': isSubComponent,
+          })}
+        >
           <div className="card-row__title">
             {categoryLink ? (
               <div className="card__actions card__actions--no-margin">
@@ -234,7 +250,11 @@ class CategoryList extends PureComponent<Props, State> {
             )}
           </div>
           {showScrollButtons && (
-            <div className="card-row__scroll-btns">
+            <div
+              className={classnames('card-row__scroll-btns', {
+                'card-row__scroll-btns--sub-component': isSubComponent,
+              })}
+            >
               <Button
                 className="btn--arrow"
                 disabled={!canScrollPrevious}
@@ -259,7 +279,9 @@ class CategoryList extends PureComponent<Props, State> {
           </div>
         ) : (
           <div
-            className="card-row__scrollhouse"
+            className={classnames('card-row__scrollhouse', {
+              'card-row__scrollhouse--sub-component': isSubComponent,
+            })}
             ref={ref => {
               this.rowItems = ref;
             }}
@@ -289,7 +311,7 @@ class CategoryList extends PureComponent<Props, State> {
             {!channelClaims &&
               !names &&
               /* eslint-disable react/no-array-index-key */
-              new Array(10).fill(1).map((x, i) => <FileCard key={i} />)
+              new Array(10).fill(1).map((x, i) => <FileCard placeholder key={i} />)
             /* eslint-enable react/no-array-index-key */
             }
           </div>

diff --git a/src/renderer/component/fileCard/view.jsx b/src/renderer/component/fileCard/view.jsx
@@ -29,11 +29,13 @@ type Props = {
   isSubscribed: boolean,
   showSubscribedLogo: boolean,
   isNew: boolean,
+  placeholder: boolean,
 };
 
 class FileCard extends React.PureComponent<Props> {
   static defaultProps = {
     showSubscribedLogo: false,
+    placeholder: false,
   };
 
   componentWillMount() {
@@ -66,14 +68,16 @@ class FileCard extends React.PureComponent<Props> {
       isNew,
       showSubscribedLogo,
       isResolvingUri,
+      placeholder,
     } = this.props;
 
-    if (!isResolvingUri && !claim && !pending) {
-      // abandoned
+    const abandoned = !isResolvingUri && !claim && !pending && !placeholder;
+
+    if (abandoned) {
       return null;
     }
 
-    if (!claim && !pending) {
+    if ((!claim && !pending) || placeholder) {
       return (
         <div className="card card--small">
           <div className="card--placeholder card__media" />

diff --git a/src/renderer/component/subscribeSuggested/view.jsx b/src/renderer/component/subscribeSuggested/view.jsx
@@ -23,7 +23,7 @@ class SuggestedSubscriptions extends PureComponent<Props> {
     return suggested ? (
       <div className="card__content subscriptions__suggested">
         {suggested.map(({ uri, label }) => (
-          <CategoryList key={uri} category={label} categoryLink={uri} />
+          <CategoryList isSubComponent key={uri} category={label} categoryLink={uri} />
         ))}
       </div>
     ) : null;

diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss
@@ -306,6 +306,10 @@
   // this needs to be used on a page with noPadding
   // doing so allows the content to scroll to the edge of the screen
   padding-left: $spacing-width;
+
+  &.card-row__header--sub-component {
+    padding-left: 0;
+  }
 }
 
 .card-row__message {
@@ -320,6 +324,12 @@
   @media (min-width: $medium-breakpoint) {
     padding-right: $spacing-width;
   }
+
+  &.card-row__scroll-btns--sub-component {
+    @media (min-width: $medium-breakpoint) {
+      padding-right: 0;
+    }
+  }
 }
 
 .card-row__scrollhouse {
@@ -353,6 +363,12 @@
       width: calc((100% / 8) - 27px);
     }
   }
+
+  &.card-row__scrollhouse--sub-component {
+    .card:first-of-type {
+      margin-left: 0;
+    }
+  }
 }
 
 .card-row__title {