Merge branch 'craft-3' of https://github.com/verbb/super-table into craft-3

Author: engram-design

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Changed
+- Super Table now requires Craft 3.1.13 or later.
+
 ## 2.1.8 - 2019-02-18
 
 ### Fixed

composer.json

@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.1.2"
+        "craftcms/cms": "^3.1.13"
     },
     "repositories": [
         {

src/services/SuperTableService.php

@@ -1,6 +1,7 @@
 <?php
 namespace verbb\supertable\services;
 
+use craft\db\Table;
 use verbb\supertable\elements\db\SuperTableBlockQuery;
 use verbb\supertable\elements\SuperTableBlockElement;
 use verbb\supertable\errors\SuperTableBlockTypeNotFoundException;
@@ -312,20 +313,17 @@ public function handleChangedBlockType(ConfigEvent $event)
             return;
         }
 
-        ProjectConfigHelper::ensureAllFieldsProcessed();
-
-        // Ensure all Matrix blocks are processed
-        $projectConfig = Craft::$app->getProjectConfig();
-        $allBlocks = $projectConfig->get(\craft\services\Matrix::CONFIG_BLOCKTYPE_KEY, true) ?? [];
-
-        foreach ($allBlocks as $blockUid => $blockData) {
-            $projectConfig->processConfigChanges(\craft\services\Matrix::CONFIG_BLOCKTYPE_KEY . '.' . $blockUid);
-        }
-
         $blockTypeUid = $event->tokenMatches[0];
         $data = $event->newValue;
         $previousData = $event->oldValue;
 
+        // Make sure the field has been synced
+        $fieldId = Db::idByUid(Table::FIELDS, $data['field']);
+        if ($fieldId === null) {
+            Craft::$app->getProjectConfig()->defer($event, [$this, __FUNCTION__]);
+            return;
+        }
+
         $fieldsService = Craft::$app->getFields();
         $contentService = Craft::$app->getContent();
 
@@ -342,7 +340,7 @@ public function handleChangedBlockType(ConfigEvent $event)
             $blockTypeRecord = $this->_getBlockTypeRecord($blockTypeUid);
 
             // Set the basic info on the new block type record
-            $blockTypeRecord->fieldId = Db::idByUid('{{%fields}}', $data['field']);
+            $blockTypeRecord->fieldId = $fieldId;
             $blockTypeRecord->uid = $blockTypeUid;
 
             // Make sure that alterations, if any, occur in the correct context.