Changeset 2381426

Timestamp:

09/14/2020 09:09:27 PM (5 years ago)

Author:

dottech

Message:

Version 1.0.3

Location:

dot-monetize-polls-quizzes/trunk

Files:

• dot-press.php (modified) (2 diffs)
• includes/class-dot-press-array-utils.php (modified) (1 diff)
• includes/class-dot-press-block-renderer.php (modified) (11 diffs)
• includes/class-dot-press-public.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

dot-monetize-polls-quizzes/trunk/dot-press.php

@@ -3 +3 @@
  * Plugin Name:       DOT | Monetize Polls & Quizzes
  * Description:      The easiest way to create and publish interactive polls and quizzes. Fully integrated monetization and analytics.
- * Version:           1.0.2
+ * Version:           1.0.3
  * Requires at least: 5.2
  * Requires PHP:      7.2
@@ -17 +17 @@
 }
 
-define( 'DOT_PRESS_VERSION', '1.0.2' );
+define( 'DOT_PRESS_VERSION', '1.0.3' );
 require_once plugin_dir_path(__FILE__) . 'constants.php';
 

dot-monetize-polls-quizzes/trunk/includes/class-dot-press-array-utils.php

@@ -23 +23 @@
         }, $arr);
     }
+
+    public static function findIndex($callable, $arr) {
+        $index = -1;
+
+        foreach (self::ensureArray($arr) as $item) {
+            $index++;
+            $found = call_user_func($callable, $item);
+
+            if ($found) {
+                return $index;
+            }
+        }
+
+        return -1;
+    }
 }

dot-monetize-polls-quizzes/trunk/includes/class-dot-press-block-renderer.php

@@ -4 +4 @@
 {
     private $post;
-    /**
-     * @var DotPressBlockCounter
-     */
-    private $counter;
-
     private $categories;
     private $tags;
@@ -14 +9 @@
     private $posts;
 
-    public function __construct($post, $counter)
+    public function __construct($post)
     {
         $this->post = $post;
-        $this->counter = $counter;
         $this->categories = DotPressArrayUtils::ensureArray(wp_get_post_categories($this->post->ID, ['fields' => 'ids']));
         $this->tags = DotPressArrayUtils::ensureArray(wp_get_post_tags($this->post->ID, ['fields' => 'ids']));
@@ -70 +64 @@
     }
 
-    private function getType($placement) {
+    private function getType($placement)
+    {
         $insertion = $placement->meta['insertion_point'][0];
 
@@ -84 +79 @@
     }
 
-    private function renderAfterLast($block_type, $placement, $carry) {
-        global $post;
+    private function renderAfterLast($block_type, $placement, $blocks, $currentIndex, $carry)
+    {
         $type = $this->getType($placement);
 
@@ -92 +87 @@
         }
 
-        $blocks = parse_blocks($post->post_content);
         $lastIndexOf = 0;
 
@@ -107 +101 @@
 
 
-
-        if ($this->counter->get_counter($block_type) === $lastIndexOf) {
+        if ($currentIndex === $lastIndexOf) {
             return $carry . $this->renderWrapper($placement, $this->renderFormats($placement));
         }
@@ -115 +108 @@
     }
 
+    private function getBlockIndex($block, $blocks)
+    {
+        $blocksOfType = array_filter($blocks, function ($b) use ($block) {
+            return $b['blockName'] === $block['blockName'];
+        });
+        
+        return DotPressArrayUtils::findIndex(function ($b) use ($block) {
+            return $b['innerHTML'] === $block['innerHTML'];
+        }, $blocksOfType);
+    }
+
     public function render($block_type, $block_content, $block)
     {
-
         if ($block_type) {
-            // todo: feels like this shouldn't be here, but not sure how else might be better? Need to think about it
-            $this->counter->count($block_type);
             if (empty($this->posts)) {
                 return $block_content;
             }
 
-            $dotCounter = $this->counter;
-            return array_reduce($this->posts, function ($carry, $placement) use ($dotCounter, $block_type) {
+            global $post;
+            $blocks = parse_blocks($post->post_content);
+            // * +1 as the placements positions start at 1
+            $index = $this->getBlockIndex($block, $blocks) + 1;
+            return array_reduce($this->posts, function ($carry, $placement) use ($block_type, $blocks, $index) {
                 $possibleInsertionPoints = ['before-paragraph', 'after-paragraph', 'before-image', 'after-image'];
                 $insertionPointBlockTypes = [
@@ -139 +143 @@
 
                 if (preg_match('/after-last/', $insertionPoint)) {
-                    return $this->renderAfterLast($block_type, $placement, $carry);
+                    return $this->renderAfterLast($block_type, $placement, $blocks, $index, $carry);
                 }
 
@@ -148 +152 @@
                 }
 
-                $counter = $dotCounter->get_counter($insertionPointBlockType);
-
                 if (in_array($insertionPoint, $possibleInsertionPoints)) {
                     $insertionNumber = intval($placement->meta['insertion_number'][0]);
 
-                    if ($insertionNumber === $counter) {
+                    if ($insertionNumber === $index) {
                         $widgetTrigger = $this->renderWrapper($placement, $this->renderFormats($placement));
 
@@ -173 +175 @@
     }
 
-    private function renderWrapper($placement, $carry) {
+    private function renderWrapper($placement, $carry)
+    {
         $marginOptions = [
             'left' => '0 auto 0 0',
@@ -183 +186 @@
     }
 
-    private function renderFormats($placement) {
+    private function renderFormats($placement)
+    {
         $widget_id = $placement->meta['widget_id'][0];
         $format = explode(',', $placement->meta['format'][0]);
-        return array_reduce($format, function($acc, $type) use ($widget_id) {
+        return array_reduce($format, function ($acc, $type) use ($widget_id) {
             return $acc . $this->renderScript($type, $widget_id);
         }, '');

dot-monetize-polls-quizzes/trunk/includes/class-dot-press-public.php

@@ -44 +44 @@
 
     /**
-     * @var DotPressBlockCounter
-     */
-    private $counter;
-
-    /**
      * @var DotPressBlockRenderer
      */
@@ -66 +61 @@
         $this->version = $version;
         $this->loader = $loader;
-        $this->counter = new DotPressBlockCounter();
 
         $this->loader->add_action( 'wp_enqueue_scripts', $this, 'enqueue_scripts' );
@@ -99 +93 @@
         if (DotPressWpUtils::is_front_end()) {
             global $post;
-            $this->renderer = new DotPressBlockRenderer($post, $this->counter);
+            $this->renderer = new DotPressBlockRenderer($post);
         }
     }

dot-monetize-polls-quizzes/trunk/readme.txt

@@ -85 +85 @@
 = 1.0.2 =
 * Stopped placement renderer from triggering when block rendering outside wp loop
+
+= 1.0.3 =
+* Tweaked placement render logic to be less prone to external plugin block usage