From 61a84ef4614ce35f88d71aedd4693f687179259d Mon Sep 17 00:00:00 2001
From: Rich Tabor <hi@richtabor.com>
Date: Wed, 5 Apr 2023 15:06:12 -0400
Subject: [PATCH] Update media and video icons (#49523)

* Use media icon in core/media-text Media Container

* Update media.js icon with new media icon (image + video display)

* Use video icon for existing media icon implementations

* Update media icon

* Use media icon for media library

* Trigger test

* Trigger test

* Update media-container.native.js
---
 .../src/media-text/media-container-icon.js           | 12 ------------
 .../block-library/src/media-text/media-container.js  |  6 +-----
 .../src/media-text/media-container.native.js         |  2 +-
 packages/icons/src/library/media.js                  |  7 ++++++-
 4 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 packages/block-library/src/media-text/media-container-icon.js

diff --git a/packages/block-library/src/media-text/media-container-icon.js b/packages/block-library/src/media-text/media-container-icon.js
deleted file mode 100644
index e5eb65d261dc58..00000000000000
--- a/packages/block-library/src/media-text/media-container-icon.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M18 2l2 4h-2l-2-4h-3l2 4h-2l-2-4h-1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2zm2 12H10V4.4L11.8 8H20z" />
-		<Path d="M14 20H4V10h3V8H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-3h-2z" />
-		<Path d="M5 19h8l-1.59-2H9.24l-.84 1.1L7 16.3 5 19z" />
-	</SVG>
-);
diff --git a/packages/block-library/src/media-text/media-container.js b/packages/block-library/src/media-text/media-container.js
index f2bdb475bae345..e5a6270bad8dc9 100644
--- a/packages/block-library/src/media-text/media-container.js
+++ b/packages/block-library/src/media-text/media-container.js
@@ -20,11 +20,7 @@ import { useDispatch } from '@wordpress/data';
 import { forwardRef } from '@wordpress/element';
 import { isBlobURL } from '@wordpress/blob';
 import { store as noticesStore } from '@wordpress/notices';
-
-/**
- * Internal dependencies
- */
-import icon from './media-container-icon';
+import { media as icon } from '@wordpress/icons';
 
 /**
  * Constants
diff --git a/packages/block-library/src/media-text/media-container.native.js b/packages/block-library/src/media-text/media-container.native.js
index a131abc9deba6c..2057486b73ac9c 100644
--- a/packages/block-library/src/media-text/media-container.native.js
+++ b/packages/block-library/src/media-text/media-container.native.js
@@ -26,12 +26,12 @@ import { Component } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { isURL, getProtocol } from '@wordpress/url';
 import { compose, withPreferredColorScheme } from '@wordpress/compose';
+import { media as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import styles from './style.scss';
-import icon from './media-container-icon';
 import SvgIconRetry from './icon-retry';
 
 /**
diff --git a/packages/icons/src/library/media.js b/packages/icons/src/library/media.js
index 23b1b1f7ecd527..a3f5cad616469d 100644
--- a/packages/icons/src/library/media.js
+++ b/packages/icons/src/library/media.js
@@ -5,7 +5,12 @@ import { SVG, Path } from '@wordpress/primitives';
 
 const media = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M18.7 3H5.3C4 3 3 4 3 5.3v13.4C3 20 4 21 5.3 21h13.4c1.3 0 2.3-1 2.3-2.3V5.3C21 4 20 3 18.7 3zm.8 15.7c0 .4-.4.8-.8.8H5.3c-.4 0-.8-.4-.8-.8V5.3c0-.4.4-.8.8-.8h13.4c.4 0 .8.4.8.8v13.4zM10 15l5-3-5-3v6z" />
+		<Path d="m7 6.5 4 2.5-4 2.5z" />
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="m5 3c-1.10457 0-2 .89543-2 2v14c0 1.1046.89543 2 2 2h14c1.1046 0 2-.8954 2-2v-14c0-1.10457-.8954-2-2-2zm14 1.5h-14c-.27614 0-.5.22386-.5.5v10.7072l3.62953-2.6465c.25108-.1831.58905-.1924.84981-.0234l2.92666 1.8969 3.5712-3.4719c.2911-.2831.7545-.2831 1.0456 0l2.9772 2.8945v-9.3568c0-.27614-.2239-.5-.5-.5zm-14.5 14.5v-1.4364l4.09643-2.987 2.99567 1.9417c.2936.1903.6798.1523.9307-.0917l3.4772-3.3806 3.4772 3.3806.0228-.0234v2.5968c0 .2761-.2239.5-.5.5h-14c-.27614 0-.5-.2239-.5-.5z"
+		/>
 	</SVG>
 );