Gutenberg Cart block

assets/js/wpmenucart-navigation-block.js

@@ -0,0 +1,62 @@
+( function( blocks, element, i18n, serverSideRender ) {
+
+	let __                = i18n.__;
+	let el                = element.createElement;
+	let registerBlockType = blocks.registerBlockType;
+	let createBlock       = blocks.createBlock;
+
+	// svg icon
+	let iconCart = el(
+		'svg',
+		{
+			width:  20,
+			height: 20,
+		},
+		el( 'path',
+			{
+				d: "M15.55 13c.75 0 1.41-.41 1.75-1.03l3.58-6.49c.37-.66-.11-1.48-.87-1.48H5.21l-.94-2H1v2h2l3.6 7.59-1.35 2.44C4.52 15.37 5.48 17 7 17h12v-2H7l1.1-2h7.45zM6.16 6h12.15l-2.76 5H8.53L6.16 6zM7 18c-1.1 0-1.99.9-1.99 2S5.9 22 7 22s2-.9 2-2-.9-2-2-2zm10 0c-1.1 0-1.99.9-1.99 2s.89 2 1.99 2 2-.9 2-2-.9-2-2-2z"
+			}
+		)
+	);
+
+	// navigation block
+	let navigationBlockSettings = {
+		title:    __( 'Cart', 'wp-menu-cart' ),
+		icon:     iconCart,
+		parent:   [ 'core/navigation' ],
+		keywords: [ 'cart' ],
+		support:  {
+			html: true,
+		},
+		transforms: {
+			from: [
+				{
+					type:      'block',
+					blocks:    [ 'core/navigation-link' ],
+					transform: () => createBlock( 'wpo/wpmenucart-navigation' )
+				}
+			]
+		},
+		edit: function( props ) {
+			return el(
+				serverSideRender,
+				{
+					block:      'wpo/wpmenucart-navigation',
+					className:  'wpmenucart-navigation-block',
+					attributes: props.attributes,
+				}
+			);
+		},
+		save: function() {
+			// return null to render from php
+			return null;
+		},
+	}
+	registerBlockType( 'wpo/wpmenucart-navigation', navigationBlockSettings );
+
+} )(
+	window.wp.blocks,
+	window.wp.element,
+	window.wp.i18n,
+	window.wp.serverSideRender,
+);

includes/wpmenucart-settings.php

@@ -4,7 +4,7 @@ class WpMenuCart_Settings {
 	public function __construct() {
 		add_action( 'admin_init', array( &$this, 'init_settings' ) ); // Registers settings
 		add_action( 'admin_menu', array( &$this, 'wpmenucart_add_page' ) );
-		add_filter( 'plugin_action_links_'.WpMenuCart::$plugin_basename, array( &$this, 'wpmenucart_add_settings_link' ) );
+		add_filter( 'plugin_action_links_'.WPO_Menu_Cart()->plugin_basename, array( &$this, 'wpmenucart_add_settings_link' ) );
 
 		//Menu admin, not using for now (very complex ajax structure...)
 		//add_action( 'admin_init', array( &$this, 'wpmenucart_add_meta_box' ) );
@@ -58,18 +58,20 @@ public function init_settings() {
 			}
 		}
 
-		add_settings_field(
-			'menu_slugs',
-			__( 'Select the menu(s) in which you want to display the Menu Cart', 'wp-menu-cart' ),
-			array( &$this, 'menus_select_element_callback' ),
-			$option,
-			'plugin_settings',
-			array(
-				'menu'		=> $option,
-				'id'		=> 'menu_slugs',
-				'options'	=> (array) $this->get_menu_array(),
-			)
-		);
+		if ( ! WPO_Menu_Cart()->is_block_theme() ) {
+			add_settings_field(
+				'menu_slugs',
+				__( 'Select the menu(s) in which you want to display the Menu Cart', 'wp-menu-cart' ),
+				array( &$this, 'menus_select_element_callback' ),
+				$option,
+				'plugin_settings',
+				array(
+					'menu'		=> $option,
+					'id'		=> 'menu_slugs',
+					'options'	=> (array) $this->get_menu_array(),
+				)
+			);
+		}
 
 		add_settings_field(
 			'always_display',

includes/wpmenucart-woocommerce.php

@@ -1,31 +1,35 @@
 <?php
 if ( ! class_exists( 'WPMenuCart_WooCommerce' ) ) {
 	class WPMenuCart_WooCommerce {
+
 		/**
 		 * Construct.
 		 */
-		public function __construct() {
-		}
+		public function __construct() {}
 
 		public function menu_item() {
-			// make sure cart is loaded! https://wordpress.org/support/topic/activation-breaks-customise?replies=10#post-7908988
-			$this->maybe_load_cart();
+			$this->maybe_load_cart(); // make sure cart is loaded! https://wordpress.org/support/topic/activation-breaks-customise?replies=10#post-7908988
 
 			$menu_item = array(
-				'cart_url'				=> $this->cart_url(),
-				'shop_page_url'			=> $this->shop_url(),
-				'cart_total'			=> strip_tags( $this->get_cart_total() ),
-				'cart_contents_count'	=> $this->get_cart_contents_count(),
+				'cart_url'            => $this->cart_url(),
+				'shop_page_url'       => $this->shop_url(),
+				'cart_total'          => strip_tags( $this->get_cart_total() ),
+				'cart_contents_count' => $this->get_cart_contents_count(),
 			);
 
 			return apply_filters( 'wpmenucart_menu_item_data', $menu_item );
 		}
 
 		public function maybe_load_cart() {
 			if ( function_exists( 'WC' ) ) {
-				if ( empty( WC()->cart ) ) {
-					WC()->cart = new WC_Cart();
+				if ( function_exists( 'wc_load_cart' ) && did_action( 'before_woocommerce_init' ) ) {
+					wc_load_cart(); // loads session, customer & cart - WC 3.6.4+ 
+				} else {
+					if ( empty( WC()->cart ) ) {
+						WC()->cart = new WC_Cart();
+					}
 				}
+				WC()->cart->get_cart(); // force cart contents refresh
 			} else {
 				global $woocommerce;
 				if ( empty( $woocommerce->cart ) ) {