@inboxsdk/core 0.2.28-alpha.3 → 0.2.28-alpha.5

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/setup-compose-view-driver-stream.js

@@ -1,162 +1,105 @@
-/* @flow */
+"use strict";
 
-import Kefir from 'kefir';
-import udKefir from 'ud-kefir';
-import streamWaitFor from '../../../lib/stream-wait-for';
-
-import kefirMakeMutationObserverChunkedStream from '../../../lib/dom/make-mutation-observer-chunked-stream';
-import makeElementChildStream from '../../../lib/dom/make-element-child-stream';
-import elementViewMapper from '../../../lib/dom/element-view-mapper';
-import makeElementStreamMerger from '../../../lib/dom/make-element-stream-merger';
-import GmailElementGetter from '../gmail-element-getter';
-
-import GmailComposeView from '../views/gmail-compose-view';
-import type GmailMessageView from '../views/gmail-message-view';
-
-import Logger from '../../../lib/logger';
-import type GmailDriver from '../gmail-driver';
-
-var impStream = udKefir(module, imp);
-
-export default function setupComposeViewDriverStream(
-  gmailDriver: GmailDriver,
-  messageViewDriverStream: Kefir.Observable<GmailMessageView>,
-  xhrInterceptorStream: Kefir.Observable<Object>
-): Kefir.Observable<GmailComposeView> {
-  return impStream.flatMapLatest((imp) =>
-    imp(gmailDriver, messageViewDriverStream, xhrInterceptorStream)
-  );
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = setupComposeViewDriverStream;
+var _kefir = _interopRequireDefault(require("kefir"));
+var _udKefir = _interopRequireDefault(require("ud-kefir"));
+var _streamWaitFor = _interopRequireDefault(require("../../../lib/stream-wait-for"));
+var _makeMutationObserverChunkedStream = _interopRequireDefault(require("../../../lib/dom/make-mutation-observer-chunked-stream"));
+var _makeElementChildStream = _interopRequireDefault(require("../../../lib/dom/make-element-child-stream"));
+var _elementViewMapper = _interopRequireDefault(require("../../../lib/dom/element-view-mapper"));
+var _makeElementStreamMerger = _interopRequireDefault(require("../../../lib/dom/make-element-stream-merger"));
+var _gmailElementGetter = _interopRequireDefault(require("../gmail-element-getter"));
+var _gmailComposeView = _interopRequireDefault(require("../views/gmail-compose-view"));
+var _logger = _interopRequireDefault(require("../../../lib/logger"));
+var impStream = (0, _udKefir.default)(module, imp);
+function setupComposeViewDriverStream(gmailDriver, messageViewDriverStream, xhrInterceptorStream) {
+  return impStream.flatMapLatest(imp => imp(gmailDriver, messageViewDriverStream, xhrInterceptorStream));
 }
-
-function imp(
-  gmailDriver: GmailDriver,
-  messageViewDriverStream: Kefir.Observable<GmailMessageView>,
-  xhrInterceptorStream: Kefir.Observable<Object>
-): Kefir.Observable<GmailComposeView> {
-  return Kefir.fromPromise(GmailElementGetter.waitForGmailModeToSettle())
-    .flatMap(() => {
-      var elementStream;
-      var isStandalone = false;
-
-      if (GmailElementGetter.isStandaloneComposeWindow()) {
-        elementStream = _setupStandaloneComposeElementStream();
-        isStandalone = true;
-      } else if (GmailElementGetter.isStandaloneThreadWindow()) {
-        elementStream = Kefir.never();
-      } else {
-        elementStream = _setupStandardComposeElementStream();
-      }
-
-      return elementStream.map(
-        elementViewMapper(
-          (el) =>
-            new GmailComposeView(el, xhrInterceptorStream, gmailDriver, {
-              isStandalone,
-              isInlineReplyForm: false,
-            })
-        )
-      );
-    })
-    .merge(
-      messageViewDriverStream.flatMap((gmailMessageView) =>
-        gmailMessageView.getReplyElementStream().map(
-          elementViewMapper(
-            (el) =>
-              new GmailComposeView(el, xhrInterceptorStream, gmailDriver, {
-                isStandalone: false,
-                isInlineReplyForm: true,
-              })
-          )
-        )
-      )
-    )
-    .flatMap((composeViewDriver: any) => composeViewDriver.ready());
+function imp(gmailDriver, messageViewDriverStream, xhrInterceptorStream) {
+  return _kefir.default.fromPromise(_gmailElementGetter.default.waitForGmailModeToSettle()).flatMap(() => {
+    var elementStream;
+    var isStandalone = false;
+    if (_gmailElementGetter.default.isStandaloneComposeWindow()) {
+      elementStream = _setupStandaloneComposeElementStream();
+      isStandalone = true;
+    } else if (_gmailElementGetter.default.isStandaloneThreadWindow()) {
+      elementStream = _kefir.default.never();
+    } else {
+      elementStream = _setupStandardComposeElementStream();
+    }
+    return elementStream.map((0, _elementViewMapper.default)(el => new _gmailComposeView.default(el, xhrInterceptorStream, gmailDriver, {
+      isStandalone,
+      isInlineReplyForm: false
+    })));
+  }).merge(messageViewDriverStream.flatMap(gmailMessageView => gmailMessageView.getReplyElementStream().map((0, _elementViewMapper.default)(el => new _gmailComposeView.default(el, xhrInterceptorStream, gmailDriver, {
+    isStandalone: false,
+    isInlineReplyForm: true
+  }))))).flatMap(composeViewDriver => composeViewDriver.ready());
 }
-
 function _setupStandardComposeElementStream() {
-  return _waitForContainerAndMonitorChildrenStream(() =>
-    GmailElementGetter.getComposeWindowContainer()
-  )
-    .flatMap((composeGrandParent) => {
-      var composeParentEl = composeGrandParent.el.querySelector('div.AD');
-      if (composeParentEl) {
-        return makeElementChildStream(composeParentEl)
-          .takeUntilBy(composeGrandParent.removalStream)
-          .map(_informElement('composeFullscreenStateChanged'));
-      } else {
-        return Kefir.never();
-      }
-    })
-    .merge(
-      GmailElementGetter.getFullscreenComposeWindowContainerStream()
-        .flatMap(({ el, removalStream }) =>
-          makeElementChildStream(el).takeUntilBy(removalStream)
-        )
-        .map(_informElement('composeFullscreenStateChanged'))
-        .map(({ el, removalStream }) => {
-          // If you close a fullscreen compose while it's still saving, Gmail never
-          // removes it from the DOM, and instead only removes a specific child
-          // element. Ugh. Watch for its removal too.
-          const targetEl = el.querySelector('[role=dialog] div.aaZ');
-          if (!targetEl) return null;
-          var hiddenStream = kefirMakeMutationObserverChunkedStream(targetEl, {
-            childList: true,
-          })
-            .filter(() => targetEl.childElementCount === 0)
-            .map(() => null);
-          return {
-            el,
-            removalStream: removalStream.merge(hiddenStream).take(1),
-          };
-        })
-        .filter(Boolean)
-    )
-    .flatMap((event) => {
-      if (!event) throw new Error('Should not happen');
-      const el = event.el.querySelector('[role=dialog]');
-      if (!el || !el.querySelector('form')) {
-        return Kefir.never();
-      }
-      return Kefir.constant({
-        el,
-        removalStream: event.removalStream,
-      });
-    })
-    .flatMap(makeElementStreamMerger());
+  return _waitForContainerAndMonitorChildrenStream(() => _gmailElementGetter.default.getComposeWindowContainer()).flatMap(composeGrandParent => {
+    var composeParentEl = composeGrandParent.el.querySelector('div.AD');
+    if (composeParentEl) {
+      return (0, _makeElementChildStream.default)(composeParentEl).takeUntilBy(composeGrandParent.removalStream).map(_informElement('composeFullscreenStateChanged'));
+    } else {
+      return _kefir.default.never();
+    }
+  }).merge(_gmailElementGetter.default.getFullscreenComposeWindowContainerStream().flatMap(_ref => {
+    let {
+      el,
+      removalStream
+    } = _ref;
+    return (0, _makeElementChildStream.default)(el).takeUntilBy(removalStream);
+  }).map(_informElement('composeFullscreenStateChanged')).map(_ref2 => {
+    let {
+      el,
+      removalStream
+    } = _ref2;
+    // If you close a fullscreen compose while it's still saving, Gmail never
+    // removes it from the DOM, and instead only removes a specific child
+    // element. Ugh. Watch for its removal too.
+    const targetEl = el.querySelector('[role=dialog] div.aaZ');
+    if (!targetEl) return null;
+    var hiddenStream = (0, _makeMutationObserverChunkedStream.default)(targetEl, {
+      childList: true
+    }).filter(() => targetEl.childElementCount === 0).map(() => null);
+    return {
+      el,
+      removalStream: removalStream.merge(hiddenStream).take(1)
+    };
+  }).filter(Boolean)).flatMap(event => {
+    if (!event) throw new Error('Should not happen');
+    const el = event.el.querySelector('[role=dialog]');
+    if (!el || !el.querySelector('form')) {
+      return _kefir.default.never();
+    }
+    return _kefir.default.constant({
+      el,
+      removalStream: event.removalStream
+    });
+  }).flatMap((0, _makeElementStreamMerger.default)());
 }
-
 function _setupStandaloneComposeElementStream() {
-  return _waitForContainerAndMonitorChildrenStream(() =>
-    GmailElementGetter.StandaloneCompose.getComposeWindowContainer()
-  );
+  return _waitForContainerAndMonitorChildrenStream(() => _gmailElementGetter.default.StandaloneCompose.getComposeWindowContainer());
 }
-
-function _waitForContainerAndMonitorChildrenStream(
-  containerFn: () => ?HTMLElement
-) {
-  return Kefir.interval(2000) // TODO replace this with page-parser-tree
-    .map(containerFn)
-    .filter()
-    .take(1)
-    .flatMap((containerEl) => makeElementChildStream(containerEl));
+function _waitForContainerAndMonitorChildrenStream(containerFn) {
+  return _kefir.default.interval(2000) // TODO replace this with page-parser-tree
+  .map(containerFn).filter().take(1).flatMap(containerEl => (0, _makeElementChildStream.default)(containerEl));
 }
-
 function _informElement(eventName) {
   return function (event) {
-    const composeEl =
-      event &&
-      event.el &&
-      event.el.querySelector &&
-      event.el.querySelector('[role=dialog]');
+    const composeEl = event && event.el && event.el.querySelector && event.el.querySelector('[role=dialog]');
     if (composeEl) {
-      composeEl.dispatchEvent(
-        new CustomEvent(eventName, {
-          bubbles: false,
-          cancelable: false,
-          detail: null,
-        })
-      );
+      composeEl.dispatchEvent(new CustomEvent(eventName, {
+        bubbles: false,
+        cancelable: false,
+        detail: null
+      }));
     }
     return event;
   };
-}
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/setup-route-view-driver-stream.js

@@ -1,189 +1,173 @@
-/* @flow */
-
-import Kefir from 'kefir';
-import get from '../../../../common/get-or-fail';
-
-import type GmailDriver from '../gmail-driver';
-import type GmailRouteProcessor from '../views/gmail-route-view/gmail-route-processor';
-import GmailElementGetter from '../gmail-element-getter';
-import GmailRouteView from '../views/gmail-route-view/gmail-route-view';
-import getURLObject from './get-url-object';
-
-import routeIDmatchesHash from '../../../lib/routeIDmatchesHash';
-
-export default function setupRouteViewDriverStream(
-  gmailRouteProcessor: GmailRouteProcessor,
-  driver: GmailDriver
-): Kefir.Observable<GmailRouteView> {
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = setupRouteViewDriverStream;
+var _kefir = _interopRequireDefault(require("kefir"));
+var _getOrFail = _interopRequireDefault(require("../../../../common/get-or-fail"));
+var _gmailElementGetter = _interopRequireDefault(require("../gmail-element-getter"));
+var _gmailRouteView = _interopRequireDefault(require("../views/gmail-route-view/gmail-route-view"));
+var _getUrlObject = _interopRequireDefault(require("./get-url-object"));
+var _routeIDmatchesHash = _interopRequireDefault(require("../../../lib/routeIDmatchesHash"));
+function setupRouteViewDriverStream(gmailRouteProcessor, driver) {
   const customRouteIDs = driver.getCustomRouteIDs();
   const customListRouteIDs = driver.getCustomListRouteIDs();
-  const customListSearchStringsToRouteIds =
-    driver.getCustomListSearchStringsToRouteIds();
-
-  let lastNativeHash = getURLObject(document.location.href).hash;
+  const customListSearchStringsToRouteIds = driver.getCustomListSearchStringsToRouteIds();
+  let lastNativeHash = (0, _getUrlObject.default)(document.location.href).hash;
   let latestGmailRouteView = null;
-
   driver.getStopper().onValue(() => {
     if (latestGmailRouteView) {
       latestGmailRouteView.destroy();
     }
   });
-
   let lastHash = lastNativeHash;
-
   let sameRouteData = {};
-
-  const eligibleHashChanges = Kefir.fromEvents(window, 'hashchange')
-    .filter((event) => !event.oldURL.match(/#inboxsdk-fake-no-vc$/))
-    .map((event) => ({
-      new: getURLObject(event.newURL),
-      old: getURLObject(event.oldURL),
-    }))
-    .filter((event) => event.new.hash !== event.old.hash)
-    .map((event) => event.new)
-    .map((urlObject) => {
-      const { hash, name } = urlObject;
-      for (let routeIDs of customRouteIDs) {
-        let routeID = routeIDmatchesHash(routeIDs, hash);
-        if (routeID) {
-          return { urlObject, type: 'CUSTOM', routeID };
-        }
-      }
-      for (let [routeIDs] of customListRouteIDs) {
-        let routeID = routeIDmatchesHash(routeIDs, name);
-        if (routeID) {
-          return { urlObject, type: 'CUSTOM_LIST_TRIGGER', routeID };
-        }
+  const eligibleHashChanges = _kefir.default.fromEvents(window, 'hashchange').filter(event => !event.oldURL.match(/#inboxsdk-fake-no-vc$/)).map(event => ({
+    new: (0, _getUrlObject.default)(event.newURL),
+    old: (0, _getUrlObject.default)(event.oldURL)
+  })).filter(event => event.new.hash !== event.old.hash).map(event => event.new).map(urlObject => {
+    const {
+      hash,
+      name
+    } = urlObject;
+    for (let routeIDs of customRouteIDs) {
+      let routeID = (0, _routeIDmatchesHash.default)(routeIDs, hash);
+      if (routeID) {
+        return {
+          urlObject,
+          type: 'CUSTOM',
+          routeID
+        };
       }
-      if (gmailRouteProcessor.isNativeRoute(urlObject.name)) {
-        return { urlObject, type: 'NATIVE' };
+    }
+    for (let [routeIDs] of customListRouteIDs) {
+      let routeID = (0, _routeIDmatchesHash.default)(routeIDs, name);
+      if (routeID) {
+        return {
+          urlObject,
+          type: 'CUSTOM_LIST_TRIGGER',
+          routeID
+        };
       }
-      return { urlObject, type: 'OTHER_APP_CUSTOM' };
-    });
-
-  const customAndCustomListRouteHashChanges = eligibleHashChanges.filter(
-    ({ type }) => type !== 'NATIVE'
-  );
+    }
+    if (gmailRouteProcessor.isNativeRoute(urlObject.name)) {
+      return {
+        urlObject,
+        type: 'NATIVE'
+      };
+    }
+    return {
+      urlObject,
+      type: 'OTHER_APP_CUSTOM'
+    };
+  });
+  const customAndCustomListRouteHashChanges = eligibleHashChanges.filter(_ref => {
+    let {
+      type
+    } = _ref;
+    return type !== 'NATIVE';
+  });
 
   // If a user goes from a native route to a custom route, and then back to the
   // same native route, we need to make a new GmailRouteView because
   // getMainContentElementChangedStream() won't be firing, except when going from thread->custom->thread
-  const revertNativeHashChanges = eligibleHashChanges
-    .filter(({ type }) => type === 'NATIVE')
-    .filter(({ urlObject }) => {
-      const tmp = lastNativeHash;
-      lastNativeHash = urlObject.hash;
-      return tmp === urlObject.hash;
-    })
-    .filter(({ urlObject }) => {
-      return urlObject.hash !== lastHash;
-    });
+  const revertNativeHashChanges = eligibleHashChanges.filter(_ref2 => {
+    let {
+      type
+    } = _ref2;
+    return type === 'NATIVE';
+  }).filter(_ref3 => {
+    let {
+      urlObject
+    } = _ref3;
+    const tmp = lastNativeHash;
+    lastNativeHash = urlObject.hash;
+    return tmp === urlObject.hash;
+  }).filter(_ref4 => {
+    let {
+      urlObject
+    } = _ref4;
+    return urlObject.hash !== lastHash;
+  });
 
   // Merge everything that can trigger a new RouteView
-  return Kefir.merge([
-    customAndCustomListRouteHashChanges,
-    revertNativeHashChanges,
-
-    // when native gmail changes main view there's a div that takes on role=main.
-    // getMainContentElementChangedStream doesn't respect custom views so filter
-    // out events from it. This filter is needed if the user is already at a custom
-    // view of another InboxSDK instance while this starts up.
-    GmailElementGetter.getMainContentElementChangedStream()
-      .map((event) => ({
-        urlObject: getURLObject(document.location.href),
-        type: 'NATIVE',
-      }))
-      .filter((options) =>
-        gmailRouteProcessor.isNativeRoute(options.urlObject.name)
-      ),
-  ])
-    .map((options) => {
-      const { type, urlObject } = options;
-      if (type === 'NATIVE' && urlObject.name === 'search') {
-        const customListRouteId = customListSearchStringsToRouteIds.get(
-          urlObject.params[0]
-        );
-        if (customListRouteId) {
-          const searchInput = GmailElementGetter.getSearchInput();
-          if (!searchInput) throw new Error('Should not happen');
-          searchInput.value = '';
-
-          // Only rewrite the url if it's a search query with no further
-          // parameters or it has a page parameter. Don't write URLs with thread
-          // id parameters because currently other parts of the code depend on
-          // being able to parse the URL as a normal thread URL.
-
-          // Additionally, we don't want to treat threads as the CUSTOM_LIST type
-          // since they're not lists.
-          if (
-            urlObject.params.length === 1 ||
-            (urlObject.params.length === 2 && urlObject.params[1][0] === 'p')
-          ) {
-            driver.hashChangeNoViewChange(
-              '#' +
-                customListRouteId +
-                (urlObject.params[1] ? '/' + urlObject.params[1] : '')
-            );
-            return {
-              type: 'CUSTOM_LIST',
-              urlObject,
-              routeID: customListRouteId,
-            };
-          }
+  return _kefir.default.merge([customAndCustomListRouteHashChanges, revertNativeHashChanges,
+  // when native gmail changes main view there's a div that takes on role=main.
+  // getMainContentElementChangedStream doesn't respect custom views so filter
+  // out events from it. This filter is needed if the user is already at a custom
+  // view of another InboxSDK instance while this starts up.
+  _gmailElementGetter.default.getMainContentElementChangedStream().map(event => ({
+    urlObject: (0, _getUrlObject.default)(document.location.href),
+    type: 'NATIVE'
+  })).filter(options => gmailRouteProcessor.isNativeRoute(options.urlObject.name))]).map(options => {
+    const {
+      type,
+      urlObject
+    } = options;
+    if (type === 'NATIVE' && urlObject.name === 'search') {
+      const customListRouteId = customListSearchStringsToRouteIds.get(urlObject.params[0]);
+      if (customListRouteId) {
+        const searchInput = _gmailElementGetter.default.getSearchInput();
+        if (!searchInput) throw new Error('Should not happen');
+        searchInput.value = '';
+
+        // Only rewrite the url if it's a search query with no further
+        // parameters or it has a page parameter. Don't write URLs with thread
+        // id parameters because currently other parts of the code depend on
+        // being able to parse the URL as a normal thread URL.
+
+        // Additionally, we don't want to treat threads as the CUSTOM_LIST type
+        // since they're not lists.
+        if (urlObject.params.length === 1 || urlObject.params.length === 2 && urlObject.params[1][0] === 'p') {
+          driver.hashChangeNoViewChange('#' + customListRouteId + (urlObject.params[1] ? '/' + urlObject.params[1] : ''));
+          return {
+            type: 'CUSTOM_LIST',
+            urlObject,
+            routeID: customListRouteId
+          };
         }
       }
-      return options;
-    })
-    .map((options) => {
-      const MAX_KEY_CACHE = 50;
-      const { urlObject } = options;
-
-      if (!sameRouteData[urlObject.hash]) {
-        sameRouteData[urlObject.hash] = {
-          data: {},
-        };
-      }
-      sameRouteData[urlObject.hash].lastUsedTimestamp = Date.now();
-
-      if (Object.keys(sameRouteData).length > MAX_KEY_CACHE) {
-        sameRouteData = Object.keys(sameRouteData)
-          .sort(
-            (a, b) =>
-              sameRouteData[b].lastUsedTimestamp -
-              sameRouteData[a].lastUsedTimestamp
-          )
-          .slice(0, MAX_KEY_CACHE / 2)
-          .reduce((acc, hash) => ({ ...acc, [hash]: sameRouteData[hash] }), {});
-      }
-
-      return {
-        ...options,
-        cachedRouteData: sameRouteData[urlObject.hash].data,
+    }
+    return options;
+  }).map(options => {
+    const MAX_KEY_CACHE = 50;
+    const {
+      urlObject
+    } = options;
+    if (!sameRouteData[urlObject.hash]) {
+      sameRouteData[urlObject.hash] = {
+        data: {}
       };
-    })
-    .map((options) => {
-      if (options.type === 'NATIVE' || options.type === 'CUSTOM_LIST') {
-        driver.showNativeRouteView();
-      } else if (options.type === 'CUSTOM_LIST_TRIGGER') {
-        driver.showCustomThreadList(
-          options.routeID,
-          get(customListRouteIDs, options.routeID),
-          options.urlObject.params
-        );
-        return;
-      }
-      return new GmailRouteView(options, gmailRouteProcessor, driver);
-    })
-    .filter(Boolean)
-    .map((gmailRouteView) => {
-      if (latestGmailRouteView) {
-        latestGmailRouteView.destroy();
-      }
-      latestGmailRouteView = gmailRouteView;
-      lastHash = getURLObject(document.location.href).hash;
-
-      return gmailRouteView;
-    });
+    }
+    sameRouteData[urlObject.hash].lastUsedTimestamp = Date.now();
+    if (Object.keys(sameRouteData).length > MAX_KEY_CACHE) {
+      sameRouteData = Object.keys(sameRouteData).sort((a, b) => sameRouteData[b].lastUsedTimestamp - sameRouteData[a].lastUsedTimestamp).slice(0, MAX_KEY_CACHE / 2).reduce((acc, hash) => ({
+        ...acc,
+        [hash]: sameRouteData[hash]
+      }), {});
+    }
+    return {
+      ...options,
+      cachedRouteData: sameRouteData[urlObject.hash].data
+    };
+  }).map(options => {
+    if (options.type === 'NATIVE' || options.type === 'CUSTOM_LIST') {
+      driver.showNativeRouteView();
+    } else if (options.type === 'CUSTOM_LIST_TRIGGER') {
+      driver.showCustomThreadList(options.routeID, (0, _getOrFail.default)(customListRouteIDs, options.routeID), options.urlObject.params);
+      return;
+    }
+    return new _gmailRouteView.default(options, gmailRouteProcessor, driver);
+  }).filter(Boolean).map(gmailRouteView => {
+    if (latestGmailRouteView) {
+      latestGmailRouteView.destroy();
+    }
+    latestGmailRouteView = gmailRouteView;
+    lastHash = (0, _getUrlObject.default)(document.location.href).hash;
+    return gmailRouteView;
+  });
 }
 
 /*
@@ -191,4 +175,4 @@ export default function setupRouteViewDriverStream(
  *
  * SDK only cares about hash change when the hash goes to a route that the app registered as custom.
  * Otherwise it only responds to route changes when the role=main div changes.
- */
+ */