@total_onion/onion-library 2.0.181 → 2.0.183

package/components/block-scrolling-banner-v3/scrolling-banner-v3.js

@@ -83,12 +83,12 @@ function scrollingbannerJs(block) {
 		wrapper.appendChild(newTickerContainer);
 
 		const animation1 = [
-			{ transform: 'translateX(0%)' },
-			{ transform: 'translateX(-100%)' }
+			{transform: 'translateX(0%)'},
+			{transform: 'translateX(-100%)'}
 		];
 		const animation2 = [
-			{ transform: 'translateX(100%)' },
-			{ transform: 'translateX(0%)' }
+			{transform: 'translateX(100%)'},
+			{transform: 'translateX(0%)'}
 		];
 
 		const time = 100000 / speed;

package/components/block-scrolling-banner-v3/scrolling-banner-v3.twig

@@ -14,8 +14,8 @@
 </style>
 <section {{block.anchor ? "id=" ~ block.anchor : ''}} class="{{blockClassName}} {{classNameEntryPoint}} {{block.id}} lazy-fade" {{dataAttributeEntryPoint}} data-blockid="{{block.id}}" data-assetkey="{{blockClassName}}">
 
-	{% set bannerText1 = fields.scrolling_banner_text1 %}
-	{% set bannerText2 = fields.scrolling_banner_text2 %}
+	{% set bannerText1 = fields.scrolling_banner_text_1 %}
+	{% set bannerText2 = fields.scrolling_banner_text_2 %}
 	{% set enableScrolling = fields.enable_scrolling_banner %}
 	{% set bannerSpeed = fields.scrolling_banner_speed %}
 	{% set imageSeperator = fields.seperator_as_image %}
@@ -47,7 +47,5 @@
 			</div>
 		</div>
 	{% endif %}
-
-
 	{# {{htmlEntryPoint}} #}
 </section>

package/components/core-block-editor-assets-v3/block-editor-assets-v3.php

@@ -1,15 +1,14 @@
 <?php
-add_action('enqueue_block_assets', 'add_block_editor_assets_v3', 10, true);
 function add_block_editor_assets_v3(): void
 {
     if (is_admin()) {
         wp_enqueue_script('editorstyles', gtp_get_asset_uri('editor.js'), array(), null, true);
-        wp_localize_script('editorstyles', 'previewvars', core_design_settings_v3());
-        wp_localize_script('editorstyles', 'siteglobal', core_site_global_v3());
-        wp_localize_script('editorstyles', 'coretypography', core_typography_v3());
+        wp_localize_script('editorstyles', 'previewvars', core_design_settings_v3(OPTIONS));
+        wp_localize_script('editorstyles', 'corePostOverrides', core_post_overrides_v3(OPTIONS));
+        wp_localize_script('editorstyles', 'coretypography', core_typography_v3(OPTIONS));
         wp_localize_script('editorstyles', 'corefontmodifiers', core_font_modifiers_v3());
-        wp_localize_script('editorstyles', 'corethemes', core_themes_v3());
-        wp_localize_script('editorstyles', 'currenttheme', core_current_theme_v3());
-        wp_localize_script('editorstyles', 'colourconfig', create_colour_data());
+        wp_localize_script('editorstyles', 'corethemes', core_themes_v3(OPTIONS));
+        wp_localize_script('editorstyles', 'currenttheme', core_current_theme_v3(OPTIONS));
+        wp_localize_script('editorstyles', 'colourconfig', create_colour_data(OPTIONS));
     }
 }

package/components/core-core-block-render-function-v3/core-block-render-function-v3.php

@@ -0,0 +1,39 @@
+<?php
+
+use Timber\Timber;
+
+/**
+ * Rendering of core blocks with Post entity
+ *
+ * @param array<string, mixed> $block block.
+ * @param string $content content.
+ * @param bool $is_preview If it's a preview.
+ */
+function core_block_render_post_object_v3(array $block, string $content = '', bool $is_preview = false, $post_id = 0, $wp_block = false, $context = false, array $extra_context = array()): void
+{
+    $context = \Timber\Timber::context();
+    $slug = substr($block['name'], 4); // Removes 'acf/' from the name.
+    $fields = get_fields();
+    $context['block'] = $block;
+    $context['fields'] = $fields;
+    $context['is_preview'] = $is_preview;
+    $context['environment'] = $_ENV['PANTHEON_ENVIRONMENT'] ?? 'local';
+
+    if (defined('OPTIONS') && is_array(OPTIONS)) {
+        $context['options']          = OPTIONS;
+        $context['nav_menus']        = Defined('NAV_MENUS') ? NAV_MENUS : [];
+    }
+
+    if ($extra_context) {
+        foreach ($extra_context as $key => $value) {
+            $context[$key] = $value;
+        }
+    }
+
+
+    if (file_exists(__DIR__ . '/../../../views/blocks/' . $slug . '.twig')) {
+        \Timber\Timber::render("blocks/{$slug}.twig", $context);
+    } else {
+        echo 'could not find Twig template for ' . $slug . '. This block may no longer be in use.';
+    }
+}

package/components/{fields-core-design-settings-v3 → core-core-design-settings-v3}/core-design-settings-v3.php

@@ -1,8 +1,11 @@
 <?php
 // @codingStandardsIgnoreStart
-function core_design_settings_v3()
+function core_design_settings_v3($options)
 {
-    $json_data = file_get_contents(get_template_directory() . '/inc/theme-data/' . CURRENT_THEME . '/design-settings-vars.json');
+    if (!is_array($options)) {
+        return [];
+    }
+    $json_data = file_get_contents(get_template_directory() . '/inc/theme-data/' . $options['current_theme_name'] . '/design-settings-vars.json');
     $design_settings_data = json_decode($json_data, true);
     $output = '';
     if ($design_settings_data) {
@@ -31,6 +34,7 @@ function core_design_settings_v3()
                 --landscape-design-reference:' . ($settings['landscape_design_reference'] ?? 1024) . ';
                 --portrait-design-reference:' . ($settings['portrait_design_reference'] ?? 1024) . ';
                 --mobile-design-reference:' . ($settings['mobile_design_reference'] ?? 1024) . ';
+                --global-content-max-width-setting:' . ($settings['global_max_width'] ?? 1024) . ';
                 }</style>';
         }
     }

package/components/core-core-post-overrides-v3/core-post-overrides-v3.php

@@ -0,0 +1,21 @@
+<?php
+// @codingStandardsIgnoreStart
+function core_post_overrides_v3($options)
+{
+    $output = '';
+    $current_post = [];
+    if (isset($GLOBALS['post'])) {
+        $current_post = Timber::get_post($GLOBALS['post']->ID);
+    }
+    if (is_array($options)) {
+
+        $output = '
+            <style id="core-site-global-v3">
+            body { 
+                --post-colour:' . ($current_post && (property_exists($current_post, 'meta') && isset($current_post->meta['post_colour'])) ? $current_post->meta['post_colour'] : '') . ';
+                --post-text-colour-style:' .  ($current_post && (property_exists($current_post, 'meta') && isset($current_post->meta['post_text_colour_style'])) ? remove_underscore($current_post->meta['post_text_colour_style']) : '') . ';
+                }</style>';
+    }
+    return [$output];
+} // END function core_design_vars
+// @codingStandardsIgnoreEnd

package/components/core-core-themes/core-themes-v3.php

@@ -0,0 +1,68 @@
+<?php
+// @codingStandardsIgnoreStart
+function core_themes_v3($options)
+{
+    if (!is_array($options)) {
+        return [];
+    }
+    $json_data = file_get_contents(get_template_directory() . '/inc/theme-data/' . $options['current_theme_name'] . '/theme-vars.json');
+    $themes_data = json_decode($json_data, true);
+    if ($themes_data) {
+
+        $output = '';
+        $output = '<style id="core-themes-vars">
+        :root { 
+            ';
+
+        foreach ($themes_data as $theme => $value) {
+            if (isset($value['theme_primary_background_type'])) {
+                $background_value = remove_underscore($value['theme_primary_background_type']) == 'solid-colour' ? $value['theme_primary_background_colour'] : (remove_underscore($value['theme_primary_background_type']) == 'gradient' ? $value['theme_primary_background_gradient'] : null);
+            } else {
+                $background_value = $value['theme_primary_background_colour'];
+            }
+            $output .=
+                '&[data-currentcolourpalette="theme-' . $theme + 1 . '"] {
+                ';
+            foreach ($value['theme_colours'] as $index => $content) {
+                if (is_array($content) && array_key_exists('theme_colour', $content)) {
+                    $output .= '--palette-default-' . ($index + 1) . ': ' . $content['theme_colour'] . ';
+                    ';
+                }
+            };
+            foreach ($value['text_colours'] as $index => $content) {
+                if (is_array($content) && array_key_exists('colour', $content)) {
+                    $output .= '--text-colour-default-' . ($index + 1) . ': ' . $content['colour'] . ';
+                    ';
+                }
+            };
+            $output .= '--theme-primary-text-colour: ' . ($value['theme_primary_text_colour'] ?? '#ffffff') . ';
+                --theme-secondary-text-colour: ' . ($value['theme_secondary_text_colour'] ?? '#ffffff') . ';
+                --theme-tertiary-text-colour: ' . ($value['theme_tertiary_text_colour'] ?? '#ffffff') . ';
+                --theme-primary-background-colour:' . $background_value . ';
+                --theme-secondary-background-colour: ' . ($value['theme_secondary_background_colour'] ?? '#ffffff') . ';
+                --theme-tertiary-background-colour: ' . ($value['theme_tertiary_background_colour'] ?? '#ffffff') . ';
+                --theme-primary-accent-colour:' . ($value['theme_primary_accent_colour'] ?? '#ffffff') . ';
+                --theme-secondary-accent-colour: ' . ($value['theme_secondary_accent_colour'] ?? '#ffffff') . ';
+                --theme-tertiary-accent-colour: ' . ($value['theme_tertiary_accent_colour'] ?? '#ffffff') . ';
+                --link-colour: ' . ($value['links']['link_colour'] ?? '#ffffff') . ';
+                --link-colour-hover: ' . ($value['links']['link_colour_hover'] ?? '#ffffff') . ';
+                --link-decoration-colour: ' . ($value['links']['link_decoration_colour'] ?? '#ffffff') . ';
+                --link-decoration-colour-hover: ' . ($value['links']['link_decoration_colour_hover'] ?? '#ffffff') . ';
+                --link-decoration-style: ' . (remove_underscore($value['links']['link_decoration_style']) ?? '#ffffff') . ';
+                --link-decoration-style-hover: ' . (remove_underscore($value['links']['link_decoration_style_hover']) ?? '#ffffff') . ';
+                --primary-font-family:' . (remove_underscore($value['theme_primary_font']['font'] ?? 'arial')) . ';
+                --secondary-font-family:' . (remove_underscore($value['theme_secondary_font']['font'] ?? 'arial')) . ';
+                --tertiary-font-family:' . (remove_underscore($value['theme_tertiary_font']['font'] ?? 'arial')) . ';
+                --quaternary-font-family:' . (remove_underscore($value['theme_quaternary_font']['font'] ?? 'arial')) . ';
+            }
+            ';
+        }
+        $output .= '}
+</style>';
+
+        return [$output];
+    } else {
+        return array();
+    }
+} // END function core_design_vars
+// @codingStandardsIgnoreEnd

package/components/core-globals/globals.php

@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Sets globals in the context
+ *
+ * @package Global Theme
+ *s
+ * @return array<string,mixed>
+ */
+
+function create_context(): array
+{
+	$context = \Timber\Timber::context();
+	$context['environment'] = $_ENV['PANTHEON_ENVIRONMENT'] ?? 'local';
+	Define('NAV_MENUS', assemble_menus());
+
+	if (file_exists(__DIR__ . '/inc/markets.php')) {
+		require_once get_template_directory() . '/inc/markets.php';
+	}
+	if (defined('ICL_LANGUAGE_CODE')) {
+		$context['market_slug'] = ICL_LANGUAGE_CODE; // @phpstan-ignore-line
+		$languages = apply_filters('wpml_active_languages', null);
+		$context['languages'] = $languages;
+	}
+
+	if (defined('OPTIONS') && is_array(OPTIONS)) {
+		if (array_key_exists('header_pattern', OPTIONS)) {
+			$context['header_post'] = Timber::get_post(OPTIONS['header_pattern']);
+		}
+		if (array_key_exists('footer_pattern', OPTIONS)) {
+			$context['footer_post'] = Timber::get_post(OPTIONS['footer_pattern']);
+		}
+		$context['options']        		 = OPTIONS;
+		$context['options']['nav_menus'] = NAV_MENUS;
+		$context['archive_links']   	 = OPTIONS['archive_links'];
+	}
+
+	return $context;
+}

package/datalayer-tools.mjs

@@ -0,0 +1,2 @@
+//This Module is WIP
+export function exampleFunction() {}

package/onion-utils.mjs

@@ -13,14 +13,13 @@ export function ttfb() {
 		const [pageNav] = entryList.getEntriesByType("navigation");
 		const time = pageNav.responseStart;
 		console.log(`TTFB: ${time} new`);
-		pushData(time);
+		pushTTFBData(time);
 	}).observe({ type: "navigation", buffered: true });
 }
 
-function pushData(time) {
+function pushTTFBData(time) {
 	window.dataLayer = window.dataLayer || [];
 	window.dataLayer.push({ ttfb: time });
-	console.log("ttfb sent");
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@total_onion/onion-library",
-	"version": "2.0.181",
+	"version": "2.0.183",
 	"description": "Component library",
 	"main": "index.js",
 	"scripts": {

package/components/fields-core-block-render-function-v3/core-block-render-function-v3.php

@@ -1,50 +0,0 @@
-<?php
-
-use Timber\Timber;
-
-/**
- * Rendering of core blocks with Post entity
- *
- * @param array<string, mixed> $block block.
- * @param string $content content.
- * @param bool $is_preview If it's a preview.
- */
-function core_block_render_post_object_v3(array $block, string $content = '', bool $is_preview = false, $post_id = 0, $wp_block = false, $context = false, array $extraContext = null): void
-{
-    $context = \Timber\Timber::context();
-    $slug = substr($block['name'], 4); // Removes 'acf/' from the name.
-    $fields = get_fields();
-    $current_post =
-        $is_preview ? Timber::get_post(get_post()->ID) : Timber::get_post();
-    $context['current_post'] = $current_post;
-    $context['block'] = $block;
-    $context['fields'] = $fields;
-    $context['is_preview'] = $is_preview;
-    $context['environment'] = $_ENV['PANTHEON_ENVIRONMENT'] ?? 'local';
-    $context['global_settings']                = defined('GLOBAL_SETTINGS') ? GLOBAL_SETTINGS : [];
-    $context['market_settings']        = defined('MARKET_SETTINGS_OPTIONS') ? MARKET_SETTINGS_OPTIONS : [];
-    $context['options']                = defined('GLOBAL_SETTINGS') ? GLOBAL_SETTINGS : [];
-    $context['cta_styles']                = defined('GLOBAL_SETTINGS') ? GLOBAL_SETTINGS : [];
-    // $context['nav_menus']               = defined('SITE_MENUS') ? SITE_MENUS : [];
-    if (file_exists(__DIR__ . '/site-menus.php')) {
-        include_once __DIR__ . '/site-menus.php';
-        $context['nav_menus'] = assemble_menus();
-    }
-
-    if ($extraContext) {
-        foreach ($extraContext as $key => $value) {
-            $context[$key] = $value;
-        }
-    }
-
-    if (defined('ICL_LANGUAGE_CODE')) {
-        $context['market_slug'] = ICL_LANGUAGE_CODE; // @phpstan-ignore-line
-        $languages = apply_filters('wpml_active_languages', null);
-        $context['languages'] = $languages;
-    }
-    if (file_exists(__DIR__ . '/../../views/blocks/' . $slug . '.twig')) {
-        \Timber\Timber::render("blocks/{$slug}.twig", $context);
-    } else {
-        echo 'could not find Twig template for ' . $slug . '. This block may no longer be in use.';
-    }
-}