Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 723 insertions, 0 deletions

diff --git a/browser/components/newtab/content-src/components/Card/Card.jsx b/browser/components/newtab/content-src/components/Card/Card.jsx
new file mode 100644
index 0000000000..9d03377f1b
--- /dev/null
+++ b/browser/components/newtab/content-src/components/Card/Card.jsx
@@ -0,0 +1,362 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import {
+  actionCreators as ac,
+  actionTypes as at,
+} from "common/Actions.sys.mjs";
+import { cardContextTypes } from "./types";
+import { connect } from "react-redux";
+import { ContextMenuButton } from "content-src/components/ContextMenu/ContextMenuButton";
+import { LinkMenu } from "content-src/components/LinkMenu/LinkMenu";
+import React from "react";
+import { ScreenshotUtils } from "content-src/lib/screenshot-utils";
+
+// Keep track of pending image loads to only request once
+const gImageLoading = new Map();
+
+/**
+ * Card component.
+ * Cards are found within a Section component and contain information about a link such
+ * as preview image, page title, page description, and some context about if the page
+ * was visited, bookmarked, trending etc...
+ * Each Section can make an unordered list of Cards which will create one instane of
+ * this class. Each card will then get a context menu which reflects the actions that
+ * can be done on this Card.
+ */
+export class _Card extends React.PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      activeCard: null,
+      imageLoaded: false,
+      cardImage: null,
+    };
+    this.onMenuButtonUpdate = this.onMenuButtonUpdate.bind(this);
+    this.onLinkClick = this.onLinkClick.bind(this);
+  }
+
+  /**
+   * Helper to conditionally load an image and update state when it loads.
+   */
+  async maybeLoadImage() {
+    // No need to load if it's already loaded or no image
+    const { cardImage } = this.state;
+    if (!cardImage) {
+      return;
+    }
+
+    const imageUrl = cardImage.url;
+    if (!this.state.imageLoaded) {
+      // Initialize a promise to share a load across multiple card updates
+      if (!gImageLoading.has(imageUrl)) {
+        const loaderPromise = new Promise((resolve, reject) => {
+          const loader = new Image();
+          loader.addEventListener("load", resolve);
+          loader.addEventListener("error", reject);
+          loader.src = imageUrl;
+        });
+
+        // Save and remove the promise only while it's pending
+        gImageLoading.set(imageUrl, loaderPromise);
+        loaderPromise
+          .catch(ex => ex)
+          .then(() => gImageLoading.delete(imageUrl))
+          .catch();
+      }
+
+      // Wait for the image whether just started loading or reused promise
+      try {
+        await gImageLoading.get(imageUrl);
+      } catch (ex) {
+        // Ignore the failed image without changing state
+        return;
+      }
+
+      // Only update state if we're still waiting to load the original image
+      if (
+        ScreenshotUtils.isRemoteImageLocal(
+          this.state.cardImage,
+          this.props.link.image
+        ) &&
+        !this.state.imageLoaded
+      ) {
+        this.setState({ imageLoaded: true });
+      }
+    }
+  }
+
+  /**
+   * Helper to obtain the next state based on nextProps and prevState.
+   *
+   * NOTE: Rename this method to getDerivedStateFromProps when we update React
+   *       to >= 16.3. We will need to update tests as well. We cannot rename this
+   *       method to getDerivedStateFromProps now because there is a mismatch in
+   *       the React version that we are using for both testing and production.
+   *       (i.e. react-test-render => "16.3.2", react => "16.2.0").
+   *
+   * See https://github.com/airbnb/enzyme/blob/master/packages/enzyme-adapter-react-16/package.json#L43.
+   */
+  static getNextStateFromProps(nextProps, prevState) {
+    const { image } = nextProps.link;
+    const imageInState = ScreenshotUtils.isRemoteImageLocal(
+      prevState.cardImage,
+      image
+    );
+    let nextState = null;
+
+    // Image is updating.
+    if (!imageInState && nextProps.link) {
+      nextState = { imageLoaded: false };
+    }
+
+    if (imageInState) {
+      return nextState;
+    }
+
+    // Since image was updated, attempt to revoke old image blob URL, if it exists.
+    ScreenshotUtils.maybeRevokeBlobObjectURL(prevState.cardImage);
+
+    nextState = nextState || {};
+    nextState.cardImage = ScreenshotUtils.createLocalImageObject(image);
+
+    return nextState;
+  }
+
+  onMenuButtonUpdate(isOpen) {
+    if (isOpen) {
+      this.setState({ activeCard: this.props.index });
+    } else {
+      this.setState({ activeCard: null });
+    }
+  }
+
+  /**
+   * Report to telemetry additional information about the item.
+   */
+  _getTelemetryInfo() {
+    // Filter out "history" type for being the default
+    if (this.props.link.type !== "history") {
+      return { value: { card_type: this.props.link.type } };
+    }
+
+    return null;
+  }
+
+  onLinkClick(event) {
+    event.preventDefault();
+    const { altKey, button, ctrlKey, metaKey, shiftKey } = event;
+    if (this.props.link.type === "download") {
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.OPEN_DOWNLOAD_FILE,
+          data: Object.assign(this.props.link, {
+            event: { button, ctrlKey, metaKey, shiftKey },
+          }),
+        })
+      );
+    } else {
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.OPEN_LINK,
+          data: Object.assign(this.props.link, {
+            event: { altKey, button, ctrlKey, metaKey, shiftKey },
+          }),
+        })
+      );
+    }
+    if (this.props.isWebExtension) {
+      this.props.dispatch(
+        ac.WebExtEvent(at.WEBEXT_CLICK, {
+          source: this.props.eventSource,
+          url: this.props.link.url,
+          action_position: this.props.index,
+        })
+      );
+    } else {
+      this.props.dispatch(
+        ac.UserEvent(
+          Object.assign(
+            {
+              event: "CLICK",
+              source: this.props.eventSource,
+              action_position: this.props.index,
+            },
+            this._getTelemetryInfo()
+          )
+        )
+      );
+
+      if (this.props.shouldSendImpressionStats) {
+        this.props.dispatch(
+          ac.ImpressionStats({
+            source: this.props.eventSource,
+            click: 0,
+            tiles: [{ id: this.props.link.guid, pos: this.props.index }],
+          })
+        );
+      }
+    }
+  }
+
+  componentDidMount() {
+    this.maybeLoadImage();
+  }
+
+  componentDidUpdate() {
+    this.maybeLoadImage();
+  }
+
+  // NOTE: Remove this function when we update React to >= 16.3 since React will
+  //       call getDerivedStateFromProps automatically. We will also need to
+  //       rename getNextStateFromProps to getDerivedStateFromProps.
+  componentWillMount() {
+    const nextState = _Card.getNextStateFromProps(this.props, this.state);
+    if (nextState) {
+      this.setState(nextState);
+    }
+  }
+
+  // NOTE: Remove this function when we update React to >= 16.3 since React will
+  //       call getDerivedStateFromProps automatically. We will also need to
+  //       rename getNextStateFromProps to getDerivedStateFromProps.
+  componentWillReceiveProps(nextProps) {
+    const nextState = _Card.getNextStateFromProps(nextProps, this.state);
+    if (nextState) {
+      this.setState(nextState);
+    }
+  }
+
+  componentWillUnmount() {
+    ScreenshotUtils.maybeRevokeBlobObjectURL(this.state.cardImage);
+  }
+
+  render() {
+    const {
+      index,
+      className,
+      link,
+      dispatch,
+      contextMenuOptions,
+      eventSource,
+      shouldSendImpressionStats,
+    } = this.props;
+    const { props } = this;
+    const title = link.title || link.hostname;
+    const isContextMenuOpen = this.state.activeCard === index;
+    // Display "now" as "trending" until we have new strings #3402
+    const { icon, fluentID } =
+      cardContextTypes[link.type === "now" ? "trending" : link.type] || {};
+    const hasImage = this.state.cardImage || link.hasImage;
+    const imageStyle = {
+      backgroundImage: this.state.cardImage
+        ? `url(${this.state.cardImage.url})`
+        : "none",
+    };
+    const outerClassName = [
+      "card-outer",
+      className,
+      isContextMenuOpen && "active",
+      props.placeholder && "placeholder",
+    ]
+      .filter(v => v)
+      .join(" ");
+
+    return (
+      <li className={outerClassName}>
+        <a
+          href={link.type === "pocket" ? link.open_url : link.url}
+          onClick={!props.placeholder ? this.onLinkClick : undefined}
+        >
+          <div className="card">
+            <div className="card-preview-image-outer">
+              {hasImage && (
+                <div
+                  className={`card-preview-image${
+                    this.state.imageLoaded ? " loaded" : ""
+                  }`}
+                  style={imageStyle}
+                />
+              )}
+            </div>
+            <div className="card-details">
+              {link.type === "download" && (
+                <div
+                  className="card-host-name alternate"
+                  data-l10n-id="newtab-menu-open-file"
+                />
+              )}
+              {link.hostname && (
+                <div className="card-host-name">
+                  {link.hostname.slice(0, 100)}
+                  {link.type === "download" && `  \u2014 ${link.description}`}
+                </div>
+              )}
+              <div
+                className={[
+                  "card-text",
+                  icon ? "" : "no-context",
+                  link.description ? "" : "no-description",
+                  link.hostname ? "" : "no-host-name",
+                ].join(" ")}
+              >
+                <h4 className="card-title" dir="auto">
+                  {link.title}
+                </h4>
+                <p className="card-description" dir="auto">
+                  {link.description}
+                </p>
+              </div>
+              <div className="card-context">
+                {icon && !link.context && (
+                  <span
+                    aria-haspopup="true"
+                    className={`card-context-icon icon icon-${icon}`}
+                  />
+                )}
+                {link.icon && link.context && (
+                  <span
+                    aria-haspopup="true"
+                    className="card-context-icon icon"
+                    style={{ backgroundImage: `url('${link.icon}')` }}
+                  />
+                )}
+                {fluentID && !link.context && (
+                  <div className="card-context-label" data-l10n-id={fluentID} />
+                )}
+                {link.context && (
+                  <div className="card-context-label">{link.context}</div>
+                )}
+              </div>
+            </div>
+          </div>
+        </a>
+        {!props.placeholder && (
+          <ContextMenuButton
+            tooltip="newtab-menu-content-tooltip"
+            tooltipArgs={{ title }}
+            onUpdate={this.onMenuButtonUpdate}
+          >
+            <LinkMenu
+              dispatch={dispatch}
+              index={index}
+              source={eventSource}
+              options={link.contextMenuOptions || contextMenuOptions}
+              site={link}
+              siteInfo={this._getTelemetryInfo()}
+              shouldSendImpressionStats={shouldSendImpressionStats}
+            />
+          </ContextMenuButton>
+        )}
+      </li>
+    );
+  }
+}
+_Card.defaultProps = { link: {} };
+export const Card = connect(state => ({
+  platform: state.Prefs.values.platform,
+}))(_Card);
+export const PlaceholderCard = props => (
+  <Card placeholder={true} className={props.className} />
+);
diff --git a/browser/components/newtab/content-src/components/Card/_Card.scss b/browser/components/newtab/content-src/components/Card/_Card.scss
new file mode 100644
index 0000000000..0c363b52d8
--- /dev/null
+++ b/browser/components/newtab/content-src/components/Card/_Card.scss
@@ -0,0 +1,331 @@
+@use 'sass:math';
+
+.card-outer {
+  @include context-menu-button;
+
+  background: var(--newtab-background-color-secondary);
+  border-radius: $border-radius-new;
+  display: inline-block;
+  height: $card-height;
+  margin-inline-end: $base-gutter;
+  position: relative;
+  width: 100%;
+
+  &:is(:focus):not(.placeholder) {
+    @include ds-focus;
+
+    transition: none;
+  }
+
+  &:hover {
+    box-shadow: none;
+    transition: none;
+  }
+
+  &.placeholder {
+    background: transparent;
+
+    .card-preview-image-outer,
+    .card-context {
+      display: none;
+    }
+  }
+
+  .card {
+    border-radius: $border-radius-new;
+    box-shadow: $shadow-card;
+    height: 100%;
+  }
+
+  > a {
+    color: inherit;
+    display: block;
+    height: 100%;
+    outline: none;
+    position: absolute;
+    width: 100%;
+
+    &:is(:focus) {
+      .card {
+        @include ds-focus;
+      }
+    }
+
+    &:is(.active, :focus) {
+      .card {
+        @include fade-in-card;
+      }
+
+      .card-title {
+        color: var(--newtab-primary-action-background);
+      }
+    }
+  }
+
+  &:is(:hover, :focus, .active):not(.placeholder) {
+    @include context-menu-button-hover;
+
+    outline: none;
+
+    .card-title {
+      color: var(--newtab-primary-action-background);
+    }
+
+    .alternate ~ .card-host-name {
+      display: none;
+    }
+
+    .card-host-name.alternate {
+      display: block;
+    }
+  }
+
+  .card-preview-image-outer {
+    background-color: var(--newtab-element-secondary-color);
+    border-radius: $border-radius-new $border-radius-new 0 0;
+    height: $card-preview-image-height;
+    overflow: hidden;
+    position: relative;
+
+    &::after {
+      border-bottom: 1px solid var(--newtab-card-hairline-color);
+      bottom: 0;
+      content: '';
+      position: absolute;
+      width: 100%;
+    }
+
+    .card-preview-image {
+      background-position: center;
+      background-repeat: no-repeat;
+      background-size: cover;
+      height: 100%;
+      opacity: 0;
+      transition: opacity 1s $photon-easing;
+      width: 100%;
+
+      &.loaded {
+        opacity: 1;
+      }
+    }
+  }
+
+  .card-details {
+    padding: 15px 16px 12px;
+  }
+
+  .card-text {
+    max-height: 4 * $card-text-line-height + $card-title-margin;
+    overflow: hidden;
+
+    &.no-host-name,
+    &.no-context {
+      max-height: 5 * $card-text-line-height + $card-title-margin;
+    }
+
+    &.no-host-name.no-context {
+      max-height: 6 * $card-text-line-height + $card-title-margin;
+    }
+
+    &:not(.no-description) .card-title {
+      max-height: 3 * $card-text-line-height;
+      overflow: hidden;
+    }
+  }
+
+  .card-host-name {
+    color: var(--newtab-text-secondary-color);
+    font-size: 10px;
+    overflow: hidden;
+    padding-bottom: 4px;
+    text-overflow: ellipsis;
+    text-transform: uppercase;
+    white-space: nowrap;
+  }
+
+  .card-host-name.alternate { display: none; }
+
+  .card-title {
+    font-size: 14px;
+    font-weight: 600;
+    line-height: $card-text-line-height;
+    margin: 0 0 $card-title-margin;
+    word-wrap: break-word;
+  }
+
+  .card-description {
+    font-size: 12px;
+    line-height: $card-text-line-height;
+    margin: 0;
+    overflow: hidden;
+    word-wrap: break-word;
+  }
+
+  .card-context {
+    bottom: 0;
+    color: var(--newtab-text-secondary-color);
+    display: flex;
+    font-size: 11px;
+    inset-inline-start: 0;
+    padding: 9px 16px 9px 14px;
+    position: absolute;
+  }
+
+  .card-context-icon {
+    fill: var(--newtab-text-secondary-color);
+    height: 22px;
+    margin-inline-end: 6px;
+  }
+
+  .card-context-label {
+    flex-grow: 1;
+    line-height: 22px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.normal-cards {
+  .card-outer {
+    // Wide layout styles
+    @media (min-width: $break-point-widest) {
+      $line-height: 23px;
+
+      height: $card-height-large;
+
+      .card-preview-image-outer {
+        height: $card-preview-image-height-large;
+      }
+
+      .card-details {
+        padding: 13px 16px 12px;
+      }
+
+      .card-text {
+        max-height: 6 * $line-height + $card-title-margin;
+      }
+
+      .card-host-name {
+        font-size: 12px;
+        padding-bottom: 5px;
+      }
+
+      .card-title {
+        font-size: 17px;
+        line-height: $line-height;
+        margin-bottom: 0;
+      }
+
+      .card-text:not(.no-description) {
+        .card-title {
+          max-height: 3 * $line-height;
+        }
+      }
+
+      .card-description {
+        font-size: 15px;
+        line-height: $line-height;
+      }
+
+      .card-context {
+        bottom: 4px;
+        font-size: 14px;
+      }
+    }
+  }
+}
+
+.compact-cards {
+  $card-detail-vertical-spacing: 12px;
+  $card-title-font-size: 12px;
+
+  .card-outer {
+    height: $card-height-compact;
+
+    .card-preview-image-outer {
+      height: $card-preview-image-height-compact;
+    }
+
+    .card-details {
+      padding: $card-detail-vertical-spacing 16px;
+    }
+
+    .card-host-name {
+      line-height: 10px;
+    }
+
+    .card-text {
+      .card-title,
+      &:not(.no-description) .card-title {
+        font-size: $card-title-font-size;
+        line-height: $card-title-font-size + 1;
+        max-height: $card-title-font-size + 5;
+        overflow: hidden;
+        padding: 0 0 4px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    .card-description {
+      display: none;
+    }
+
+    .card-context {
+      $icon-size: 16px;
+      $container-size: 32px;
+
+      background-color: var(--newtab-background-color-secondary);
+      border-radius: math.div($container-size, 2);
+      clip-path: inset(-1px -1px $container-size - ($card-height-compact - $card-preview-image-height-compact - 2 * $card-detail-vertical-spacing));
+      height: $container-size;
+      width: $container-size;
+      padding: math.div($container-size - $icon-size, 2);
+      // The -1 at the end is so both opacity borders don't overlap, which causes bug 1629483
+      top: $card-preview-image-height-compact - math.div($container-size, 2) - 1;
+      inset-inline-end: 12px;
+      inset-inline-start: auto;
+
+      &::after {
+        border: 1px solid var(--newtab-card-hairline-color);
+        border-bottom: 0;
+        border-radius: math.div($container-size, 2) + 1 math.div($container-size, 2) + 1 0 0;
+        content: '';
+        position: absolute;
+        height: math.div($container-size + 2, 2);
+        width: $container-size + 2;
+        top: -1px;
+        left: -1px;
+      }
+
+      .card-context-icon {
+        margin-inline-end: 0;
+        height: $icon-size;
+        width: $icon-size;
+
+        &.icon-bookmark-added {
+          fill: $bookmark-icon-fill;
+        }
+
+        &.icon-download {
+          fill: $download-icon-fill;
+        }
+
+        &.icon-pocket {
+          fill: $pocket-icon-fill;
+        }
+      }
+
+      .card-context-label {
+        display: none;
+      }
+    }
+  }
+
+  @media not all and (min-width: $break-point-widest) {
+    .hide-for-narrow {
+      display: none;
+    }
+  }
+}
diff --git a/browser/components/newtab/content-src/components/Card/types.js b/browser/components/newtab/content-src/components/Card/types.js
new file mode 100644
index 0000000000..0b17eea408
--- /dev/null
+++ b/browser/components/newtab/content-src/components/Card/types.js
@@ -0,0 +1,30 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+export const cardContextTypes = {
+  history: {
+    fluentID: "newtab-label-visited",
+    icon: "history-item",
+  },
+  removedBookmark: {
+    fluentID: "newtab-label-removed-bookmark",
+    icon: "bookmark-removed",
+  },
+  bookmark: {
+    fluentID: "newtab-label-bookmarked",
+    icon: "bookmark-added",
+  },
+  trending: {
+    fluentID: "newtab-label-recommended",
+    icon: "trending",
+  },
+  pocket: {
+    fluentID: "newtab-label-saved",
+    icon: "pocket",
+  },
+  download: {
+    fluentID: "newtab-label-download",
+    icon: "download",
+  },
+};