Merge branch 'trunk' into feature/96-analytics-programs

bin/prefix-vendor-namespace.php

@@ -0,0 +1,48 @@
+#!/usr/bin/env php
+<?php
+declare( strict_types=1 );
+
+// phpcs:ignoreFile
+
+$replacements  = [
+	'League\\Container' => 'league/container',
+	'League\\ISO3166'   => 'league/iso3166',
+];
+$vendor_dir    = dirname( __DIR__ ) . '/vendor';
+$new_namespace = 'Automattic\\WooCommerce\\GoogleListingsAndAds\\Vendor';
+
+foreach ( $replacements as $namespace => $path ) {
+	$files = array_filter(
+		explode(
+			"\n",
+			`find {$vendor_dir}/{$path} -iname '*.php'`
+		)
+	);
+
+	$quoted = preg_quote( $namespace, '#' );
+	foreach ( $files as $file ) {
+		$contents = file_get_contents( $file );
+
+		// Check to see whether a replacement has already run. Just in case.
+		if ( false !== strpos( $contents, $new_namespace ) ) {
+			continue 2;
+		}
+
+		file_put_contents(
+			$file,
+			preg_replace(
+				"#^(\s*)(use|namespace)\s*({$quoted})#m",
+				"\$1\$2 {$new_namespace}\\\\\$3",
+				$contents
+			)
+		);
+	}
+
+	// Update the namespace in the composer.json file.
+	$composer_file     = "{$vendor_dir}/{$path}/composer.json";
+	$composer_contents = file_get_contents( $composer_file );
+	file_put_contents(
+		$composer_file,
+		str_replace( "\"{$namespace}", "\"{$new_namespace}\\{$namespace}", $composer_contents )
+	);
+}

composer.json

@@ -10,7 +10,8 @@
     "automattic/jetpack-connection": "^1.20",
     "google/apiclient": "^2.7",
     "googleads/google-ads-php": "^6.1",
-    "league/container": "^3.3"
+    "league/container": "^3.3",
+    "league/iso3166": "^3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.5 || ^7",
@@ -21,7 +22,8 @@
   "autoload": {
     "psr-4": {
       "Automattic\\WooCommerce\\GoogleListingsAndAds\\": "src/",
-      "Automattic\\WooCommerce\\GoogleListingsAndAds\\Vendor\\League\\Container\\": "vendor/league/container/src/"
+      "Automattic\\WooCommerce\\GoogleListingsAndAds\\Vendor\\League\\Container\\": "vendor/league/container/src/",
+      "Automattic\\WooCommerce\\GoogleListingsAndAds\\Vendor\\League\\ISO3166\\": "vendor/league/iso3166/src/"
     }
   },
   "autoload-dev": {
@@ -38,11 +40,11 @@
   "scripts": {
     "post-install-cmd": [
       "Google\\Task\\Composer::cleanup",
-      "sh ./bin/prefix-vendor-namespaces.sh"
+      "php ./bin/prefix-vendor-namespace.php"
     ],
     "post-update-cmd": [
       "Google\\Task\\Composer::cleanup",
-      "sh ./bin/prefix-vendor-namespaces.sh"
+      "php ./bin/prefix-vendor-namespace.php"
     ]
   },
   "extra": {

google-listings-and-ads.php

@@ -42,7 +42,7 @@ function () {
 );
 
 /**
- * Get out main container object.
+ * Get our main container object.
  *
  * @return ContainerInterface
  */

js/src/components/app-country-multi-select/index.js

@@ -0,0 +1,46 @@
+/**
+ * External dependencies
+ */
+import { SelectControl } from '@woocommerce/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import './index.scss';
+
+const AppCountryMultiSelect = ( props ) => {
+	const { value = [], onChange = () => {} } = props;
+
+	// TODO: get list of countries from backend API.
+	const options = [
+		{
+			key: 'AUS',
+			label: 'Australia',
+			value: { id: 'AUS' },
+		},
+		{
+			key: 'USA',
+			label: 'United States of America',
+			value: { id: 'USA' },
+		},
+	];
+
+	return (
+		<SelectControl
+			className="app-country-multi-select"
+			multiple
+			isSearchable
+			inlineTags
+			options={ options }
+			placeholder={ __(
+				'Start typing to filter countries…',
+				'google-listings-and-ads'
+			) }
+			selected={ value }
+			onChange={ onChange }
+		/>
+	);
+};
+
+export default AppCountryMultiSelect;

js/src/components/app-country-multi-select/index.scss

@@ -0,0 +1,20 @@
+.app-country-multi-select {
+	// don't show the default magnifier icon.
+	i.material-icons-outlined {
+		display: none;
+	}
+
+	// CSS hacks to fix the input UI.
+	&.woocommerce-select-control {
+		.components-base-control {
+			.woocommerce-select-control__control-input,
+			.woocommerce-select-control__tags {
+				margin: 0;
+			}
+
+			.woocommerce-tag {
+				max-height: 24px;
+			}
+		}
+	}
+}