Merge branch 'release/5.0.7'

Author: w00fz

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v5.0.7
+## 09/28/2021
+
+1. [](#bugfix)
+    * NextGen Editor: Ensure content of children shortcode elements, such as UI Tab content, have a new empty line as prefix and suffix, to ensure Markdown lists are not lost [getgrav/grav-premium-issues#123](https://github.com/getgrav/grav-premium-issues/issues/123)
+2. [](#improved)
+    * Added `processShortcodesRaw()` using raw_handlers [#104](https://github.com/getgrav/grav-plugin-shortcode-core/pull/104)
+    * Better vertical alignment for inline shortcodes in NextGen Editor
+
 # v5.0.6
 ## 04/27/2021
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Shortcode Core
 slug: shortcode-core
 type: plugin
-version: 5.0.6
+version: 5.0.7
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:
@@ -86,7 +86,7 @@ form:
 
     css.notice_enabled:
       type: toggle
-      label: Enbable Notice Shortcode CSS
+      label: Enable Notice Shortcode CSS
       help: Enable the default notice CSS by default. Disable if you want to use your own custom CSS.
       highlight: 1
       default: 1

classes/plugin/ShortcodeManager.php

@@ -283,16 +283,27 @@ public function processRawContent(PageInterface $page, Data $config)
      * For example when used by Twig directly
      *
      * @param $str
+     * @param null $handlers
      * @return string
      */
-    public function processShortcodes($str)
+    public function processShortcodes($str, $handlers = null)
     {
         $parser = $this->getParser($this->config->get('parser'));
-        $processor = new Processor(new $parser(new CommonSyntax()), $this->handlers);
+
+        if (!$handlers) {
+            $handlers = $this->handlers;
+        }
+
+        $processor = new Processor(new $parser(new CommonSyntax()), $handlers);
 
         return $processor->process($str);
     }
 
+    public function processShortcodesRaw($str)
+    {
+        return $this->processShortcodes($str, $this->raw_handlers);
+    }
+
     /**
      * set a state of a particular item with a hash for retrieval later
      * 

nextgen-editor/dist/css/app.css

@@ -9,16 +9,16 @@
     "lint": "vue-cli-service lint"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.12",
-    "@vue/cli-plugin-eslint": "~4.5.12",
-    "@vue/cli-service": "~4.5.12",
+    "@vue/cli-plugin-babel": "~4.5.13",
+    "@vue/cli-plugin-eslint": "~4.5.13",
+    "@vue/cli-service": "~4.5.13",
     "@vue/eslint-config-airbnb": "^5.3.0",
     "babel-eslint": "^10.1.0",
     "directory-named-webpack-plugin": "^4.0.1",
-    "eslint": "^7.25.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-vue": "^7.9.0",
-    "node-sass": "^5.0.0",
-    "sass-loader": "^11.0.1"
+    "eslint": "^7.32.0",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-vue": "^7.18.0",
+    "node-sass": "^6.0.1",
+    "sass-loader": "^12.1.0"
   }
 }

nextgen-editor/dist/js/app.js

@@ -234,6 +234,7 @@ shortcode-inline {
   display: inline-flex;
   margin-left: 2px;
   margin-right: 1px;
+  vertical-align: middle;
 }
 
 shortcode-inline-editable,
@@ -244,6 +245,7 @@ shortcode-inline-readonly {
 
 shortcode-inline > .sc-content {
   display: inline-flex;
+  align-items: center;
 }
 
 shortcode-inline > .sc-settings {

nextgen-editor/dist/js/app.js.map

@@ -66,6 +66,10 @@ window.nextgenEditor.addHook('hookHTMLtoMarkdown', {
             content = `\n${content}\n`;
           }
 
+          if (shortcode.parent) {
+            content = `\n${content}\n`;
+          }
+
           output = output.replace(hash, `${groups.opening}${content}${groups.closing}`);
         }