@uppy/provider-views - npm Package Compare versions

Comparing version 1.11.2 to 1.12.0

lib/Breadcrumbs.js

@@ -8,4 +8,4 @@ var _require = require('preact'),
     type: "button",
-    class: "uppy-u-reset",
-    onclick: props.getFolder
+    className: "uppy-u-reset",
+    onClick: props.getFolder
   }, props.title), !props.isLast ? ' / ' : '');
@@ -16,5 +16,5 @@ };
   return h("div", {
-    class: "uppy-Provider-breadcrumbs"
+    className: "uppy-Provider-breadcrumbs"
   }, h("div", {
-    class: "uppy-Provider-breadcrumbsIcon"
+    className: "uppy-Provider-breadcrumbsIcon"
   }, props.breadcrumbsIcon), props.directories.map(function (directory, i) {
@@ -21,0 +21,0 @@ return h(Breadcrumb, {

lib/Browser.js

@@ -31,7 +31,7 @@ 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); }
   return h("div", {
-    class: classNames('uppy-ProviderBrowser', "uppy-ProviderBrowser-viewType--" + props.viewType)
+    className: classNames('uppy-ProviderBrowser', "uppy-ProviderBrowser-viewType--" + props.viewType)
   }, h("div", {
-    class: "uppy-ProviderBrowser-header"
+    className: "uppy-ProviderBrowser-header"
   }, h("div", {
-    class: classNames('uppy-ProviderBrowser-headerBar', !props.showBreadcrumbs && 'uppy-ProviderBrowser-headerBar--simple')
+    className: classNames('uppy-ProviderBrowser-headerBar', !props.showBreadcrumbs && 'uppy-ProviderBrowser-headerBar--simple')
   }, props.headerComponent)), props.showFilter && h(Filter, props), h(ItemList, {
@@ -38,0 +38,0 @@ columns: [{

lib/CloseWrapper.js

@@ -1,3 +0,5 @@
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
 
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 var _require = require('preact'),
@@ -4,0 +6,0 @@ Component = _require.Component;

lib/Filter.js

 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
 
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 var _require = require('preact'),
@@ -33,12 +35,12 @@ h = _require.h,
     return h("div", {
-      class: "uppy-ProviderBrowser-search"
+      className: "uppy-ProviderBrowser-search"
     }, h("input", {
-      class: "uppy-u-reset uppy-ProviderBrowser-searchInput",
+      className: "uppy-u-reset uppy-ProviderBrowser-searchInput",
       type: "text",
       placeholder: this.props.i18n('filter'),
       "aria-label": this.props.i18n('filter'),
-      onkeyup: this.preventEnterPress,
-      onkeydown: this.preventEnterPress,
-      onkeypress: this.preventEnterPress,
-      oninput: function oninput(e) {
+      onKeyUp: this.preventEnterPress,
+      onKeyDown: this.preventEnterPress,
+      onKeyPress: this.preventEnterPress,
+      onInput: function onInput(e) {
         return _this2.props.filterQuery(e);
@@ -50,3 +52,3 @@ },
       focusable: "false",
-      class: "uppy-c-icon uppy-ProviderBrowser-searchIcon",
+      className: "uppy-c-icon uppy-ProviderBrowser-searchIcon",
       width: "12",
@@ -58,11 +60,11 @@ height: "12",
     })), this.props.filterInput && h("button", {
-      class: "uppy-u-reset uppy-ProviderBrowser-searchClose",
+      className: "uppy-u-reset uppy-ProviderBrowser-searchClose",
       type: "button",
       "aria-label": this.props.i18n('resetFilter'),
       title: this.props.i18n('resetFilter'),
-      onclick: this.props.filterQuery
+      onClick: this.props.filterQuery
     }, h("svg", {
       "aria-hidden": "true",
       focusable: "false",
-      class: "uppy-c-icon",
+      className: "uppy-c-icon",
       viewBox: "0 0 19 19"
@@ -69,0 +71,0 @@ }, h("path", {

lib/FooterActions.js

@@ -6,12 +6,12 @@ var _require = require('preact'),
   return h("div", {
-    class: "uppy-ProviderBrowser-footer"
+    className: "uppy-ProviderBrowser-footer"
   }, h("button", {
-    class: "uppy-u-reset uppy-c-btn uppy-c-btn-primary",
-    onclick: props.done
+    className: "uppy-u-reset uppy-c-btn uppy-c-btn-primary",
+    onClick: props.done
   }, props.i18n('selectX', {
     smart_count: props.selected
   })), h("button", {
-    class: "uppy-u-reset uppy-c-btn uppy-c-btn-link",
-    onclick: props.cancel
+    className: "uppy-u-reset uppy-c-btn uppy-c-btn-link",
+    onClick: props.cancel
   }, props.i18n('cancel')));
 };

lib/Item/components/GridLi.js

@@ -7,11 +7,11 @@ var _require = require('preact'),
   return h("li", {
-    class: props.className,
+    className: props.className,
     title: props.isDisabled ? props.restrictionReason : null
   }, h("div", {
     "aria-hidden": true,
-    class: "uppy-ProviderBrowserItem-fakeCheckbox " + (props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : '')
+    className: "uppy-ProviderBrowserItem-fakeCheckbox " + (props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : '')
   }), h("button", {
     type: "button",
-    class: "uppy-u-reset uppy-ProviderBrowserItem-inner",
-    onclick: props.toggleCheckbox,
+    className: "uppy-u-reset uppy-ProviderBrowserItem-inner",
+    onClick: props.toggleCheckbox,
     role: "option",
@@ -18,0 +18,0 @@ "aria-label": props.isChecked ? props.i18n('unselectFileNamed', {

lib/Item/components/ItemIcon.js

@@ -8,3 +8,3 @@ var _require = require('preact'),
     focusable: "false",
-    class: "uppy-c-icon",
+    className: "uppy-c-icon",
     width: 11,
@@ -22,3 +22,3 @@ height: 14.5,
     focusable: "false",
-    class: "uppy-c-icon",
+    className: "uppy-c-icon",
     style: {
@@ -25,0 +25,0 @@ minWidth: 16,

lib/Item/components/ListLi.js

@@ -10,18 +10,18 @@ var _require = require('preact'),
       });
-    } else {
-      return props.i18n('selectAllFilesFromFolderNamed', {
-        name: props.title
-      });
     }
-  } else {
-    if (props.isChecked) {
-      return props.i18n('unselectFileNamed', {
-        name: props.title
-      });
-    } else {
-      return props.i18n('selectFileNamed', {
-        name: props.title
-      });
-    }
+
+    return props.i18n('selectAllFilesFromFolderNamed', {
+      name: props.title
+    });
   }
+
+  if (props.isChecked) {
+    return props.i18n('unselectFileNamed', {
+      name: props.title
+    });
+  }
+
+  return props.i18n('selectFileNamed', {
+    name: props.title
+  });
 }; // if folder:
@@ -37,7 +37,7 @@ //   + checkbox (selects all files from folder)
   return h("li", {
-    class: props.className,
+    className: props.className,
     title: props.isDisabled ? props.restrictionReason : null
-  }, h("button", {
+  }, !props.isCheckboxDisabled ? h("button", {
     type: "button",
-    class: "uppy-u-reset uppy-ProviderBrowserItem-fakeCheckbox " + (props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : ''),
+    className: "uppy-u-reset uppy-ProviderBrowserItem-fakeCheckbox " + (props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : ''),
     onClick: props.toggleCheckbox // for the <label/>
@@ -52,13 +52,13 @@ ,
     "data-uppy-super-focusable": true
-  }), props.type === 'file' ? // label for a checkbox
+  }) : null, props.type === 'file' ? // label for a checkbox
   h("label", {
-    for: props.id,
-    class: "uppy-u-reset uppy-ProviderBrowserItem-inner"
+    htmlFor: props.id,
+    className: "uppy-u-reset uppy-ProviderBrowserItem-inner"
   }, h("div", {
-    class: "uppy-ProviderBrowserItem-iconWrap"
+    className: "uppy-ProviderBrowserItem-iconWrap"
   }, props.itemIconEl), props.showTitles && props.title) : // button to open a folder
   h("button", {
     type: "button",
-    class: "uppy-u-reset uppy-ProviderBrowserItem-inner",
-    onclick: props.handleFolderClick,
+    className: "uppy-u-reset uppy-ProviderBrowserItem-inner",
+    onClick: props.handleFolderClick,
     "aria-label": props.i18n('openFolderNamed', {
@@ -68,4 +68,4 @@ name: props.title
   }, h("div", {
-    class: "uppy-ProviderBrowserItem-iconWrap"
+    className: "uppy-ProviderBrowserItem-iconWrap"
   }, props.itemIconEl), props.showTitles && h("span", null, props.title)));
 };

lib/ItemList.js

@@ -8,4 +8,7 @@ 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); }
 
-var Item = require('./Item/index');
+var Item = require('./Item/index'); // Hopefully this name will not be used by Google
 
+
+var VIRTUAL_SHARED_DIR = 'shared-with-me';
+
 var getSharedProps = function getSharedProps(fileOrFolder, props) {
@@ -30,5 +33,10 @@ return {
 module.exports = function (props) {
-  if (!props.folders.length && !props.files.length) {
+  var folders = props.folders,
+      files = props.files,
+      handleScroll = props.handleScroll,
+      isChecked = props.isChecked;
+
+  if (!folders.length && !files.length) {
     return h("div", {
-      class: "uppy-Provider-empty"
+      className: "uppy-Provider-empty"
     }, props.i18n('noFilesFound'));
@@ -38,13 +46,14 @@ }
   return h("div", {
-    class: "uppy-ProviderBrowser-body"
+    className: "uppy-ProviderBrowser-body"
   }, h("ul", {
-    class: "uppy-ProviderBrowser-list",
-    onscroll: props.handleScroll,
+    className: "uppy-ProviderBrowser-list",
+    onScroll: handleScroll,
     role: "listbox" // making <ul> not focusable for firefox
     ,
-    tabindex: "-1"
-  }, props.folders.map(function (folder) {
+    tabIndex: "-1"
+  }, folders.map(function (folder) {
     return Item(_extends({}, getSharedProps(folder, props), {
       type: 'folder',
-      isDisabled: props.isChecked(folder) ? props.isChecked(folder).loading : false,
+      isDisabled: isChecked(folder) ? isChecked(folder).loading : false,
+      isCheckboxDisabled: folder.id === VIRTUAL_SHARED_DIR,
       handleFolderClick: function handleFolderClick() {
@@ -54,3 +63,3 @@ return props.handleFolderClick(folder);
     }));
-  }), props.files.map(function (file) {
+  }), files.map(function (file) {
     var validateRestrictions = props.validateRestrictions(remoteFileObjToLocal(file), [].concat(props.uppyFiles, props.currentSelection));
@@ -57,0 +66,0 @@ var sharedProps = getSharedProps(file, props);

lib/Loader.js

@@ -6,4 +6,4 @@ var _require = require('preact'),
   return h("div", {
-    class: "uppy-Provider-loading"
+    className: "uppy-Provider-loading"
   }, h("span", null, props.i18n('loading')));
 };

lib/ProviderView/AuthView.js

@@ -1,3 +0,5 @@
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
 
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 var _require = require('preact'),
@@ -18,10 +20,10 @@ h = _require.h,
     var pluginNameComponent = h("span", {
-      class: "uppy-Provider-authTitleName"
+      className: "uppy-Provider-authTitleName"
     }, this.props.pluginName, h("br", null));
     return h("div", {
-      class: "uppy-Provider-auth"
+      className: "uppy-Provider-auth"
     }, h("div", {
-      class: "uppy-Provider-authIcon"
+      className: "uppy-Provider-authIcon"
     }, this.props.pluginIcon()), h("div", {
-      class: "uppy-Provider-authTitle"
+      className: "uppy-Provider-authTitle"
     }, this.props.i18nArray('authenticateWithTitle', {
@@ -31,4 +33,4 @@ pluginName: pluginNameComponent
       type: "button",
-      class: "uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-Provider-authBtn",
-      onclick: this.props.handleAuth,
+      className: "uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-Provider-authBtn",
+      onClick: this.props.handleAuth,
       "data-uppy-super-focusable": true
@@ -35,0 +37,0 @@ }, this.props.i18nArray('authenticateWith', {

lib/ProviderView/ProviderView.js

@@ -458,3 +458,5 @@ var _class, _temp;
         return new RegExp("^" + value + "$");
-      } else if (value instanceof RegExp) {
+      }
+
+      if (value instanceof RegExp) {
         return value;
@@ -534,5 +536,5 @@ }
           });
-        } else {
-          return resolve(files);
         }
+
+        return resolve(files);
       }).catch(function (e) {
@@ -553,5 +555,5 @@ return reject(e);
         return _this7.addFolder(file);
-      } else {
-        return _this7.addFile(file);
       }
+
+      return _this7.addFile(file);
     });
@@ -657,2 +659,2 @@
   return ProviderView;
-}(), _class.VERSION = "1.11.2", _temp);
+}(), _class.VERSION = "1.12.0", _temp);

lib/ProviderView/User.js

@@ -6,10 +6,10 @@ var _require = require('preact'),
   return [h("span", {
-    class: "uppy-ProviderBrowser-user",
+    className: "uppy-ProviderBrowser-user",
     key: "username"
   }, props.username), h("button", {
     type: "button",
-    onclick: props.logout,
-    class: "uppy-u-reset uppy-ProviderBrowser-userLogout",
+    onClick: props.logout,
+    className: "uppy-u-reset uppy-ProviderBrowser-userLogout",
     key: "logout"
   }, props.i18n('logOut'))];
 };

lib/SearchProviderView/Header.js

@@ -7,5 +7,5 @@ var _require = require('preact'),
     type: "button",
-    onclick: props.triggerSearchInput,
-    class: "uppy-u-reset uppy-ProviderBrowser-userLogout"
+    onClick: props.triggerSearchInput,
+    className: "uppy-u-reset uppy-ProviderBrowser-userLogout"
   }, props.i18n('backToSearch'));
 };

lib/SearchProviderView/InputView.js

@@ -20,9 +20,9 @@ var _require = require('preact'),
   return h("div", {
-    class: "uppy-SearchProvider"
+    className: "uppy-SearchProvider"
   }, h("input", {
-    class: "uppy-u-reset uppy-c-textInput uppy-SearchProvider-input",
+    className: "uppy-u-reset uppy-c-textInput uppy-SearchProvider-input",
     type: "text",
     "aria-label": props.i18n('enterTextToSearch'),
     placeholder: props.i18n('enterTextToSearch'),
-    onkeyup: handleKeyPress,
+    onKeyUp: handleKeyPress,
     ref: function ref(input_) {
@@ -33,6 +33,6 @@ input = input_;
   }), h("button", {
-    class: "uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-SearchProvider-searchButton",
+    className: "uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-SearchProvider-searchButton",
     type: "button",
-    onclick: validateAndSearch
+    onClick: validateAndSearch
   }, props.i18n('searchImages')));
 };

lib/SearchProviderView/SearchProviderView.js

@@ -290,2 +290,2 @@ var _class, _temp;
   return ProviderView;
-}(), _class.VERSION = "1.11.2", _temp);
+}(), _class.VERSION = "1.12.0", _temp);

package.json

 {
   "name": "@uppy/provider-views",
   "description": "View library for Uppy remote provider plugins.",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "license": "MIT",
@@ -22,3 +22,3 @@ "main": "lib/index.js",
   "dependencies": {
-    "@uppy/utils": "^3.4.2",
+    "@uppy/utils": "^3.5.0",
     "classnames": "^2.2.6",
@@ -30,3 +30,3 @@ "preact": "8.2.9"
   },
-  "gitHead": "4bf107236340dc98f8584f15a06e13ffa9fc31f4"
+  "gitHead": "6771545fe70134088a5441ef5c2f7b872e32d812"
 }

src/Breadcrumbs.js

@@ -9,4 +9,4 @@ const { h } = require('preact')
         type="button"
-        class="uppy-u-reset"
-        onclick={props.getFolder}
+        className="uppy-u-reset"
+        onClick={props.getFolder}
       >
@@ -22,4 +22,4 @@ {props.title}
   return (
-    <div class="uppy-Provider-breadcrumbs">
-      <div class="uppy-Provider-breadcrumbsIcon">{props.breadcrumbsIcon}</div>
+    <div className="uppy-Provider-breadcrumbs">
+      <div className="uppy-Provider-breadcrumbsIcon">{props.breadcrumbsIcon}</div>
       {
@@ -26,0 +26,0 @@ props.directories.map((directory, i) => (

src/Browser.js

@@ -14,3 +14,3 @@ const classNames = require('classnames')
     filterItems,
-    filterInput
+    filterInput,
   } = props
@@ -29,5 +29,5 @@
   return (
-    <div class={classNames('uppy-ProviderBrowser', `uppy-ProviderBrowser-viewType--${props.viewType}`)}>
-      <div class="uppy-ProviderBrowser-header">
-        <div class={classNames('uppy-ProviderBrowser-headerBar', !props.showBreadcrumbs && 'uppy-ProviderBrowser-headerBar--simple')}>
+    <div className={classNames('uppy-ProviderBrowser', `uppy-ProviderBrowser-viewType--${props.viewType}`)}>
+      <div className="uppy-ProviderBrowser-header">
+        <div className={classNames('uppy-ProviderBrowser-headerBar', !props.showBreadcrumbs && 'uppy-ProviderBrowser-headerBar--simple')}>
           {props.headerComponent}
@@ -40,3 +40,3 @@ </div>
           name: 'Name',
-          key: 'title'
+          key: 'title',
         }]}
@@ -43,0 +43,0 @@ folders={filteredFolders}

src/Filter.js

@@ -18,15 +18,15 @@ const { h, Component } = require('preact')
     return (
-      <div class="uppy-ProviderBrowser-search">
+      <div className="uppy-ProviderBrowser-search">
         <input
-          class="uppy-u-reset uppy-ProviderBrowser-searchInput"
+          className="uppy-u-reset uppy-ProviderBrowser-searchInput"
           type="text"
           placeholder={this.props.i18n('filter')}
           aria-label={this.props.i18n('filter')}
-          onkeyup={this.preventEnterPress}
-          onkeydown={this.preventEnterPress}
-          onkeypress={this.preventEnterPress}
-          oninput={(e) => this.props.filterQuery(e)}
+          onKeyUp={this.preventEnterPress}
+          onKeyDown={this.preventEnterPress}
+          onKeyPress={this.preventEnterPress}
+          onInput={(e) => this.props.filterQuery(e)}
           value={this.props.filterInput}
         />
-        <svg aria-hidden="true" focusable="false" class="uppy-c-icon uppy-ProviderBrowser-searchIcon" width="12" height="12" viewBox="0 0 12 12">
+        <svg aria-hidden="true" focusable="false" className="uppy-c-icon uppy-ProviderBrowser-searchIcon" width="12" height="12" viewBox="0 0 12 12">
           <path d="M8.638 7.99l3.172 3.172a.492.492 0 1 1-.697.697L7.91 8.656a4.977 4.977 0 0 1-2.983.983C2.206 9.639 0 7.481 0 4.819 0 2.158 2.206 0 4.927 0c2.721 0 4.927 2.158 4.927 4.82a4.74 4.74 0 0 1-1.216 3.17zm-3.71.685c2.176 0 3.94-1.726 3.94-3.856 0-2.129-1.764-3.855-3.94-3.855C2.75.964.984 2.69.984 4.819c0 2.13 1.765 3.856 3.942 3.856z" />
@@ -36,9 +36,9 @@ </svg>
           <button
-            class="uppy-u-reset uppy-ProviderBrowser-searchClose"
+            className="uppy-u-reset uppy-ProviderBrowser-searchClose"
             type="button"
             aria-label={this.props.i18n('resetFilter')}
             title={this.props.i18n('resetFilter')}
-            onclick={this.props.filterQuery}
+            onClick={this.props.filterQuery}
           >
-            <svg aria-hidden="true" focusable="false" class="uppy-c-icon" viewBox="0 0 19 19">
+            <svg aria-hidden="true" focusable="false" className="uppy-c-icon" viewBox="0 0 19 19">
               <path d="M17.318 17.232L9.94 9.854 9.586 9.5l-.354.354-7.378 7.378h.707l-.62-.62v.706L9.318 9.94l.354-.354-.354-.354L1.94 1.854v.707l.62-.62h-.706l7.378 7.378.354.354.354-.354 7.378-7.378h-.707l.622.62v-.706L9.854 9.232l-.354.354.354.354 7.378 7.378.708-.707-7.38-7.378v.708l7.38-7.38.353-.353-.353-.353-.622-.622-.353-.353-.354.352-7.378 7.38h.708L2.56 1.23 2.208.88l-.353.353-.622.62-.353.355.352.353 7.38 7.38v-.708l-7.38 7.38-.353.353.352.353.622.622.353.353.354-.353 7.38-7.38h-.708l7.38 7.38z" />
@@ -45,0 +45,0 @@ </svg>

src/FooterActions.js

@@ -5,9 +5,9 @@ const { h } = require('preact')
   return (
-    <div class="uppy-ProviderBrowser-footer">
-      <button class="uppy-u-reset uppy-c-btn uppy-c-btn-primary" onclick={props.done}>
+    <div className="uppy-ProviderBrowser-footer">
+      <button className="uppy-u-reset uppy-c-btn uppy-c-btn-primary" onClick={props.done}>
         {props.i18n('selectX', {
-          smart_count: props.selected
+          smart_count: props.selected,
         })}
       </button>
-      <button class="uppy-u-reset uppy-c-btn uppy-c-btn-link" onclick={props.cancel}>
+      <button className="uppy-u-reset uppy-c-btn uppy-c-btn-link" onClick={props.cancel}>
         {props.i18n('cancel')}
@@ -14,0 +14,0 @@ </button>

src/index.js

@@ -6,3 +6,3 @@ const ProviderViews = require('./ProviderView')
   ProviderViews,
-  SearchProviderViews
+  SearchProviderViews,
 }

src/Item/components/GridLi.js

@@ -6,8 +6,8 @@ const { h } = require('preact')
   return (
-    <li class={props.className} title={props.isDisabled ? props.restrictionReason : null}>
-      <div aria-hidden class={`uppy-ProviderBrowserItem-fakeCheckbox ${props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : ''}`} />
+    <li className={props.className} title={props.isDisabled ? props.restrictionReason : null}>
+      <div aria-hidden className={`uppy-ProviderBrowserItem-fakeCheckbox ${props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : ''}`} />
       <button
         type="button"
-        class="uppy-u-reset uppy-ProviderBrowserItem-inner"
-        onclick={props.toggleCheckbox}
+        className="uppy-u-reset uppy-ProviderBrowserItem-inner"
+        onClick={props.toggleCheckbox}
         role="option"
@@ -14,0 +14,0 @@ aria-label={props.isChecked ? props.i18n('unselectFileNamed', { name: props.title }) : props.i18n('selectFileNamed', { name: props.title })}

src/Item/components/ItemIcon.js

@@ -5,3 +5,3 @@ const { h } = require('preact')
   return (
-    <svg aria-hidden="true" focusable="false" class="uppy-c-icon" width={11} height={14.5} viewBox="0 0 44 58">
+    <svg aria-hidden="true" focusable="false" className="uppy-c-icon" width={11} height={14.5} viewBox="0 0 44 58">
       <path d="M27.437.517a1 1 0 0 0-.094.03H4.25C2.037.548.217 2.368.217 4.58v48.405c0 2.212 1.82 4.03 4.03 4.03H39.03c2.21 0 4.03-1.818 4.03-4.03V15.61a1 1 0 0 0-.03-.28 1 1 0 0 0 0-.093 1 1 0 0 0-.03-.032 1 1 0 0 0 0-.03 1 1 0 0 0-.032-.063 1 1 0 0 0-.03-.063 1 1 0 0 0-.032 0 1 1 0 0 0-.03-.063 1 1 0 0 0-.032-.03 1 1 0 0 0-.03-.063 1 1 0 0 0-.063-.062l-14.593-14a1 1 0 0 0-.062-.062A1 1 0 0 0 28 .708a1 1 0 0 0-.374-.157 1 1 0 0 0-.156 0 1 1 0 0 0-.03-.03l-.003-.003zM4.25 2.547h22.218v9.97c0 2.21 1.82 4.03 4.03 4.03h10.564v36.438a2.02 2.02 0 0 1-2.032 2.032H4.25c-1.13 0-2.032-.9-2.032-2.032V4.58c0-1.13.902-2.032 2.03-2.032zm24.218 1.345l10.375 9.937.75.718H30.5c-1.13 0-2.032-.9-2.032-2.03V3.89z" />
@@ -14,3 +14,3 @@ </svg>
   return (
-    <svg aria-hidden="true" focusable="false" class="uppy-c-icon" style={{ minWidth: 16, marginRight: 3 }} viewBox="0 0 276.157 276.157">
+    <svg aria-hidden="true" focusable="false" className="uppy-c-icon" style={{ minWidth: 16, marginRight: 3 }} viewBox="0 0 276.157 276.157">
       <path d="M273.08 101.378c-3.3-4.65-8.86-7.32-15.254-7.32h-24.34V67.59c0-10.2-8.3-18.5-18.5-18.5h-85.322c-3.63 0-9.295-2.875-11.436-5.805l-6.386-8.735c-4.982-6.814-15.104-11.954-23.546-11.954H58.73c-9.292 0-18.638 6.608-21.737 15.372l-2.033 5.752c-.958 2.71-4.72 5.37-7.596 5.37H18.5C8.3 49.09 0 57.39 0 67.59v167.07c0 .886.16 1.73.443 2.52.152 3.306 1.18 6.424 3.053 9.064 3.3 4.652 8.86 7.32 15.255 7.32h188.487c11.395 0 23.27-8.425 27.035-19.18l40.677-116.188c2.11-6.035 1.43-12.164-1.87-16.816zM18.5 64.088h8.864c9.295 0 18.64-6.607 21.738-15.37l2.032-5.75c.96-2.712 4.722-5.373 7.597-5.373h29.565c3.63 0 9.295 2.876 11.437 5.806l6.386 8.735c4.982 6.815 15.104 11.954 23.546 11.954h85.322c1.898 0 3.5 1.602 3.5 3.5v26.47H69.34c-11.395 0-23.27 8.423-27.035 19.178L15 191.23V67.59c0-1.898 1.603-3.5 3.5-3.5zm242.29 49.15l-40.676 116.188c-1.674 4.78-7.812 9.135-12.877 9.135H18.75c-1.447 0-2.576-.372-3.02-.997-.442-.625-.422-1.814.057-3.18l40.677-116.19c1.674-4.78 7.812-9.134 12.877-9.134h188.487c1.448 0 2.577.372 3.02.997.443.625.423 1.814-.056 3.18z" />
@@ -17,0 +17,0 @@ </svg>

src/Item/components/ListLi.js

@@ -7,12 +7,9 @@ const { h } = require('preact')
       return props.i18n('unselectAllFilesFromFolderNamed', { name: props.title })
-    } else {
-      return props.i18n('selectAllFilesFromFolderNamed', { name: props.title })
     }
-  } else {
-    if (props.isChecked) {
-      return props.i18n('unselectFileNamed', { name: props.title })
-    } else {
-      return props.i18n('selectFileNamed', { name: props.title })
-    }
+    return props.i18n('selectAllFilesFromFolderNamed', { name: props.title })
   }
+  if (props.isChecked) {
+    return props.i18n('unselectFileNamed', { name: props.title })
+  }
+  return props.i18n('selectFileNamed', { name: props.title })
 }
@@ -28,21 +25,23 @@
   return (
-    <li class={props.className} title={props.isDisabled ? props.restrictionReason : null}>
-      <button
-        type="button"
-        class={`uppy-u-reset uppy-ProviderBrowserItem-fakeCheckbox ${props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : ''}`}
-        onClick={props.toggleCheckbox}
-        // for the <label/>
-        id={props.id}
-        role="option"
-        aria-label={getAriaLabelOfCheckbox(props)}
-        aria-selected={props.isChecked}
-        aria-disabled={props.isDisabled}
-        disabled={props.isDisabled}
-        data-uppy-super-focusable
-      />
+    <li className={props.className} title={props.isDisabled ? props.restrictionReason : null}>
+      {!props.isCheckboxDisabled ? (
+        <button
+          type="button"
+          className={`uppy-u-reset uppy-ProviderBrowserItem-fakeCheckbox ${props.isChecked ? 'uppy-ProviderBrowserItem-fakeCheckbox--is-checked' : ''}`}
+          onClick={props.toggleCheckbox}
+          // for the <label/>
+          id={props.id}
+          role="option"
+          aria-label={getAriaLabelOfCheckbox(props)}
+          aria-selected={props.isChecked}
+          aria-disabled={props.isDisabled}
+          disabled={props.isDisabled}
+          data-uppy-super-focusable
+        />
+      ) : null}
 
       {props.type === 'file' ? (
         // label for a checkbox
-        <label for={props.id} class="uppy-u-reset uppy-ProviderBrowserItem-inner">
-          <div class="uppy-ProviderBrowserItem-iconWrap">
+        <label htmlFor={props.id} className="uppy-u-reset uppy-ProviderBrowserItem-inner">
+          <div className="uppy-ProviderBrowserItem-iconWrap">
             {props.itemIconEl}
@@ -56,7 +55,7 @@ </div>
           type="button"
-          class="uppy-u-reset uppy-ProviderBrowserItem-inner"
-          onclick={props.handleFolderClick}
+          className="uppy-u-reset uppy-ProviderBrowserItem-inner"
+          onClick={props.handleFolderClick}
           aria-label={props.i18n('openFolderNamed', { name: props.title })}
         >
-          <div class="uppy-ProviderBrowserItem-iconWrap">
+          <div className="uppy-ProviderBrowserItem-iconWrap">
             {props.itemIconEl}
@@ -63,0 +62,0 @@ </div>

src/ItemList.js

@@ -5,2 +5,5 @@ const { h } = require('preact')
 
+// Hopefully this name will not be used by Google
+const VIRTUAL_SHARED_DIR = 'shared-with-me'
+
 const getSharedProps = (fileOrFolder, props) => ({
@@ -15,28 +18,31 @@ id: fileOrFolder.id,
   viewType: props.viewType,
-  i18n: props.i18n
+  i18n: props.i18n,
 })
 
 module.exports = (props) => {
-  if (!props.folders.length && !props.files.length) {
-    return <div class="uppy-Provider-empty">{props.i18n('noFilesFound')}</div>
+  const { folders, files, handleScroll, isChecked } = props
+
+  if (!folders.length && !files.length) {
+    return <div className="uppy-Provider-empty">{props.i18n('noFilesFound')}</div>
   }
 
   return (
-    <div class="uppy-ProviderBrowser-body">
+    <div className="uppy-ProviderBrowser-body">
       <ul
-        class="uppy-ProviderBrowser-list"
-        onscroll={props.handleScroll}
+        className="uppy-ProviderBrowser-list"
+        onScroll={handleScroll}
         role="listbox"
         // making <ul> not focusable for firefox
-        tabindex="-1"
+        tabIndex="-1"
       >
-        {props.folders.map(folder => {
+        {folders.map(folder => {
           return Item({
             ...getSharedProps(folder, props),
             type: 'folder',
-            isDisabled: props.isChecked(folder) ? props.isChecked(folder).loading : false,
-            handleFolderClick: () => props.handleFolderClick(folder)
+            isDisabled: isChecked(folder) ? isChecked(folder).loading : false,
+            isCheckboxDisabled: folder.id === VIRTUAL_SHARED_DIR,
+            handleFolderClick: () => props.handleFolderClick(folder),
           })
         })}
-        {props.files.map(file => {
+        {files.map(file => {
           const validateRestrictions = props.validateRestrictions(
@@ -53,3 +59,3 @@ remoteFileObjToLocal(file),
             isDisabled: !validateRestrictions.result && !sharedProps.isChecked,
-            restrictionReason: restrictionReason
+            restrictionReason,
           })
@@ -56,0 +62,0 @@ })}

src/Loader.js

@@ -5,3 +5,3 @@ const { h } = require('preact')
   return (
-    <div class="uppy-Provider-loading">
+    <div className="uppy-Provider-loading">
       <span>{props.i18n('loading')}</span>
@@ -8,0 +8,0 @@ </div>

src/ProviderView/AuthView.js

@@ -6,8 +6,11 @@ const { h, Component } = require('preact')
     const pluginNameComponent = (
-      <span class="uppy-Provider-authTitleName">{this.props.pluginName}<br /></span>
+      <span className="uppy-Provider-authTitleName">
+        {this.props.pluginName}
+        <br />
+      </span>
     )
     return (
-      <div class="uppy-Provider-auth">
-        <div class="uppy-Provider-authIcon">{this.props.pluginIcon()}</div>
-        <div class="uppy-Provider-authTitle">
+      <div className="uppy-Provider-auth">
+        <div className="uppy-Provider-authIcon">{this.props.pluginIcon()}</div>
+        <div className="uppy-Provider-authTitle">
           {this.props.i18nArray('authenticateWithTitle', { pluginName: pluginNameComponent })}
@@ -17,4 +20,4 @@ </div>
           type="button"
-          class="uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-Provider-authBtn"
-          onclick={this.props.handleAuth}
+          className="uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-Provider-authBtn"
+          onClick={this.props.handleAuth}
           data-uppy-super-focusable
@@ -21,0 +24,0 @@ >

src/ProviderView/Header.js

@@ -11,3 +11,3 @@ const User = require('./User')
       breadcrumbsIcon: props.pluginIcon && props.pluginIcon(),
-      title: props.title
+      title: props.title,
     }))
@@ -19,3 +19,3 @@ }
     username: props.username,
-    i18n: props.i18n
+    i18n: props.i18n,
   }))
@@ -22,0 +22,0 @@

src/ProviderView/ProviderView.js

@@ -41,3 +41,3 @@ const { h } = require('preact')
       showFilter: true,
-      showBreadcrumbs: true
+      showBreadcrumbs: true,
     }
@@ -77,3 +77,3 @@
       filterInput: '',
-      isSearchVisible: false
+      isSearchVisible: false,
     })
@@ -135,3 +135,4 @@ }
       },
-      this.handleError)
+      this.handleError
+    )
   }
@@ -158,3 +159,3 @@
       body: {
-        fileId: file.id
+        fileId: file.id,
       },
@@ -165,6 +166,6 @@ remote: {
         body: {
-          fileId: file.id
+          fileId: file.id,
         },
-        providerOptions: this.provider.opts
-      }
+        providerOptions: this.provider.opts,
+      },
     }
@@ -199,3 +200,3 @@
               provider: this.plugin.title,
-              url: res.manual_revoke_url
+              url: res.manual_revoke_url,
             })
@@ -209,3 +210,3 @@ this.plugin.uppy.info(message, 'info', 7000)
             folders: [],
-            directories: []
+            directories: [],
           }
@@ -219,9 +220,7 @@ this.plugin.setPluginState(newState)
     const state = this.plugin.getPluginState()
-    this.plugin.setPluginState(Object.assign({}, state, {
-      filterInput: e ? e.target.value : ''
-    }))
+    this.plugin.setPluginState({ ...state, filterInput: e ? e.target.value : '' })
   }
 
   sortByTitle () {
-    const state = Object.assign({}, this.plugin.getPluginState())
+    const state = { ...this.plugin.getPluginState() }
     const { files, folders, sorting } = state
@@ -243,11 +242,12 @@
 
-    this.plugin.setPluginState(Object.assign({}, state, {
+    this.plugin.setPluginState({
+      ...state,
       files: sortedFiles,
       folders: sortedFolders,
-      sorting: (sorting === 'titleDescending') ? 'titleAscending' : 'titleDescending'
-    }))
+      sorting: (sorting === 'titleDescending') ? 'titleAscending' : 'titleDescending',
+    })
   }
 
   sortByDate () {
-    const state = Object.assign({}, this.plugin.getPluginState())
+    const state = { ...this.plugin.getPluginState() }
     const { files, folders, sorting } = state
@@ -276,11 +276,12 @@
 
-    this.plugin.setPluginState(Object.assign({}, state, {
+    this.plugin.setPluginState({
+      ...state,
       files: sortedFiles,
       folders: sortedFolders,
-      sorting: (sorting === 'dateDescending') ? 'dateAscending' : 'dateDescending'
-    }))
+      sorting: (sorting === 'dateDescending') ? 'dateAscending' : 'dateDescending',
+    })
   }
 
   sortBySize () {
-    const state = Object.assign({}, this.plugin.getPluginState())
+    const state = { ...this.plugin.getPluginState() }
     const { files, sorting } = state
@@ -303,6 +304,7 @@
 
-    this.plugin.setPluginState(Object.assign({}, state, {
+    this.plugin.setPluginState({
+      ...state,
       files: sortedFiles,
-      sorting: (sorting === 'sizeDescending') ? 'sizeAscending' : 'sizeDescending'
-    }))
+      sorting: (sorting === 'sizeDescending') ? 'sizeAscending' : 'sizeDescending',
+    })
   }
@@ -334,3 +336,3 @@
         loading: false,
-        files: ids
+        files: ids,
       }
@@ -342,3 +344,3 @@ this.plugin.setPluginState({ selectedFolders: folders })
         message = this.plugin.uppy.i18n('folderAdded', {
-          smart_count: count, folder: folder.name
+          smart_count: count, folder: folder.name,
         })
@@ -362,3 +364,3 @@ } else {
       name: file.name || file.id,
-      type: file.mimeType
+      type: file.mimeType,
     })
@@ -400,3 +402,3 @@ }
         return new RegExp(`^${value}$`)
-      } else if (value instanceof RegExp) {
+      } if (value instanceof RegExp) {
         return value
@@ -419,3 +421,3 @@ }
     const message = uppy.i18n('companionError')
-    uppy.info({ message: message, details: error.toString() }, 'error', 5000)
+    uppy.info({ message, details: error.toString() }, 'error', 5000)
   }
@@ -455,5 +457,4 @@
             .catch(e => reject(e))
-        } else {
-          return resolve(files)
         }
+        return resolve(files)
       }).catch(e => reject(e))
@@ -468,5 +469,4 @@ })
         return this.addFolder(file)
-      } else {
-        return this.addFile(file)
       }
+      return this.addFile(file)
     })
@@ -529,6 +529,7 @@
       username: this.username,
-      i18n: this.plugin.uppy.i18n
+      i18n: this.plugin.uppy.i18n,
     }
 
-    const browserProps = Object.assign({}, this.plugin.getPluginState(), {
+    const browserProps = {
+      ...this.plugin.getPluginState(),
       username: this.username,
@@ -557,4 +558,4 @@ getNextFolder: this.getNextFolder,
       uppyFiles: this.plugin.uppy.getFiles(),
-      validateRestrictions: this.plugin.uppy.validateRestrictions
-    })
+      validateRestrictions: this.plugin.uppy.validateRestrictions,
+    }
 
@@ -561,0 +562,0 @@ return (

src/ProviderView/User.js

@@ -5,7 +5,7 @@ const { h } = require('preact')
   return ([
-    <span class="uppy-ProviderBrowser-user" key="username">{props.username}</span>,
-    <button type="button" onclick={props.logout} class="uppy-u-reset uppy-ProviderBrowser-userLogout" key="logout">
+    <span className="uppy-ProviderBrowser-user" key="username">{props.username}</span>,
+    <button type="button" onClick={props.logout} className="uppy-u-reset uppy-ProviderBrowser-userLogout" key="logout">
       {props.i18n('logOut')}
-    </button>
+    </button>,
   ])
 }

src/SearchProviderView/Header.js

@@ -5,3 +5,3 @@ const { h } = require('preact')
   return (
-    <button type="button" onclick={props.triggerSearchInput} class="uppy-u-reset uppy-ProviderBrowser-userLogout">
+    <button type="button" onClick={props.triggerSearchInput} className="uppy-u-reset uppy-ProviderBrowser-userLogout">
       {props.i18n('backToSearch')}
@@ -8,0 +8,0 @@ </button>

src/SearchProviderView/InputView.js

@@ -18,9 +18,9 @@ const { h } = require('preact')
   return (
-    <div class="uppy-SearchProvider">
+    <div className="uppy-SearchProvider">
       <input
-        class="uppy-u-reset uppy-c-textInput uppy-SearchProvider-input"
+        className="uppy-u-reset uppy-c-textInput uppy-SearchProvider-input"
         type="text"
         aria-label={props.i18n('enterTextToSearch')}
         placeholder={props.i18n('enterTextToSearch')}
-        onkeyup={handleKeyPress}
+        onKeyUp={handleKeyPress}
         ref={(input_) => { input = input_ }}
@@ -30,5 +30,5 @@ data-uppy-super-focusable
       <button
-        class="uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-SearchProvider-searchButton"
+        className="uppy-u-reset uppy-c-btn uppy-c-btn-primary uppy-SearchProvider-searchButton"
         type="button"
-        onclick={validateAndSearch}
+        onClick={validateAndSearch}
       >
@@ -35,0 +35,0 @@ {props.i18n('searchImages')}

src/SearchProviderView/SearchProviderView.js

@@ -32,3 +32,3 @@ const { h } = require('preact')
       showFilter: false,
-      showBreadcrumbs: false
+      showBreadcrumbs: false,
     }
@@ -62,3 +62,3 @@
       filterInput: '',
-      isSearchVisible: false
+      isSearchVisible: false,
     })
@@ -118,3 +118,3 @@ }
       body: {
-        fileId: file.id
+        fileId: file.id,
       },
@@ -125,6 +125,6 @@ remote: {
         body: {
-          fileId: file.id
+          fileId: file.id,
         },
-        providerOptions: Object.assign({}, this.provider.opts, { provider: null })
-      }
+        providerOptions: { ...this.provider.opts, provider: null },
+      },
     }
@@ -151,3 +151,3 @@
       name: file.name || file.id,
-      type: file.mimeType
+      type: file.mimeType,
     })
@@ -160,3 +160,3 @@ }
     const message = uppy.i18n('companionError')
-    uppy.info({ message: message, details: error.toString() }, 'error', 5000)
+    uppy.info({ message, details: error.toString() }, 'error', 5000)
   }
@@ -228,3 +228,4 @@
     const targetViewOptions = { ...this.opts, ...viewOptions }
-    const browserProps = Object.assign({}, this.plugin.getPluginState(), {
+    const browserProps = {
+      ...this.plugin.getPluginState(),
       isChecked: this._sharedHandler.isChecked,
@@ -237,3 +238,3 @@ toggleCheckbox: this._sharedHandler.toggleCheckbox,
         triggerSearchInput: this.triggerSearchInput,
-        i18n: this.plugin.uppy.i18n
+        i18n: this.plugin.uppy.i18n,
       }),
@@ -248,4 +249,4 @@ title: this.plugin.title,
       uppyFiles: this.plugin.uppy.getFiles(),
-      validateRestrictions: this.plugin.uppy.validateRestrictions
-    })
+      validateRestrictions: this.plugin.uppy.validateRestrictions,
+    }
 
@@ -252,0 +253,0 @@ return (

src/SharedHandler.js

@@ -69,7 +69,7 @@ const remoteFileObjToLocal = require('@uppy/utils/lib/remoteFileObjToLocal')
       this.plugin.setPluginState({
-        currentSelection: currentSelection.filter((item) => item.id !== file.id)
+        currentSelection: currentSelection.filter((item) => item.id !== file.id),
       })
     } else {
       this.plugin.setPluginState({
-        currentSelection: currentSelection.concat([file])
+        currentSelection: currentSelection.concat([file]),
       })
@@ -76,0 +76,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

244118

increased by0.57%

Lines of code

3319

increased by0.42%

Dependency changes

• Updated@uppy/utils@^3.5.0