Merge pull request #51 from michelegiorgi/development

Release 1.5.5

assets/scripts/public/fields/select.js

@@ -9,7 +9,7 @@ export const fieldSelect = (field, conversational) => {
     field.classList.add(el('field', '', 'open'))
   })
   select.addEventListener('blur', () => {
-    field.classList.remove(el('field', '', 'open'))
+    setTimeout(()=> { field.classList.remove(el('field', '', 'open')) }, 100)
   })
   customSelect(field, input, select, conversational)
 }

assets/scripts/public/modules/fields.js

@@ -4,16 +4,22 @@ import { moveStep } from './navigation'
 import { updateDbg } from './dbg'
 
 export let inputFocus = (input, field, dbg = false) => {
+  let pressed = false;
   input.addEventListener('focus', () => {
     field.classList.add(el('field', '', 'focus'))
     showHints(field)
     if(dbg) { updateDbg(field) }
     pushEvent('FieldFocus', { el: field })
   })
   input.addEventListener('blur', () => {
-    field.classList.remove(el('field', '', 'focus'))
-    clearHints()
+    if(!pressed) {
+      field.classList.remove(el('field', '', 'focus'))
+      clearHints()
+    }
   })
+  field.addEventListener('mousedown', () => { pressed = true })
+  field.addEventListener('mouseup', () => { pressed = false })
+  field.addEventListener('mouseleave', () => { pressed = false })
 }
 
 export let inputPlaceholder = (input, field) => {

assets/styles/admin/layouts/sidebar.scss

@@ -88,6 +88,7 @@
             border-radius: 50%;
             margin-bottom: 4px;
             margin-right: 8px;
+            padding: 0;
           }
           &:only-child {
             width: 100%;

assets/styles/public/layouts/_nav.scss

@@ -60,6 +60,14 @@
           &:before {
             @include icon(check);
           }
+          &:after {
+            content: counter(formality-nav);
+            position: absolute;
+            pointer-events: none;
+            opacity: 0;
+            width: 1px;
+            height: 1px;
+          }
         }
         + .fo__nav__section {
           pointer-events: all;

formality.php

@@ -12,7 +12,7 @@
  * Plugin Name:       Formality
  * Plugin URI:        https://formality.dev
  * Description:       Forms made simple (and cute). Designless, multistep, conversational, secure, all-in-one WordPress forms plugin.
- * Version:           1.5.4
+ * Version:           1.5.5
  * Author:            Michele Giorgi
  * Author URI:        https://giorgi.io
  * License:           GPLv3
@@ -47,7 +47,7 @@
 /**
  * Currently plugin version.
  */
-define('FORMALITY_VERSION', '1.5.4');
+define('FORMALITY_VERSION', '1.5.5');
 define('FORMALITY_PATH', plugin_dir_path( __FILE__ ));
 
 /**

includes/class-formality.php

@@ -57,7 +57,7 @@ class Formality {
    */
   public function __construct() {
 
-    $this->version = defined( 'FORMALITY_VERSION' ) ? FORMALITY_VERSION : '1.5.4';
+    $this->version = defined( 'FORMALITY_VERSION' ) ? FORMALITY_VERSION : '1.5.5';
     $this->formality = 'formality';
 
     $this->load_dependencies();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Formality",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "author": "Michele Giorgi <[email protected]>",
   "homepage": "https://giorgi.io",
   "private": true,
@@ -37,15 +37,15 @@
   "devDependencies": {
     "@babel/plugin-syntax-jsx": "^7.16.7",
     "@babel/preset-react": "^7.16.7",
-    "@wordpress/babel-preset-default": "^6.7.0",
+    "@wordpress/babel-preset-default": "^6.10.0",
     "@wordpress/browserslist-config": "^4.1.2",
     "@wordpress/dependency-extraction-webpack-plugin": "^3.4.1",
     "babel-eslint": "^10.1.0",
     "browser-sync": "^2.27.9",
     "browser-sync-webpack-plugin": "^2.0.1",
     "cross-env": "^7.0.2",
-    "eslint": "^8.12.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint": "^8.15.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-react": "^7.29.4",
     "laravel-mix": "^6.0.43",
     "laravel-mix-banner": "^0.1.4",
@@ -54,9 +54,9 @@
     "npm-run-all": "^4.1",
     "purgecss-with-wordpress": "^4.1.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.49.9",
+    "sass": "^1.51.0",
     "sass-loader": "^12.6.0",
-    "stylelint": "^14.6.1",
+    "stylelint": "^14.8.2",
     "stylelint-config-standard": "^25.0.0",
     "vue-template-compiler": "^2.6.12"
   },

readme.txt

@@ -3,8 +3,8 @@ Contributors: michelegiorgi
 Donate link: https://www.paypal.me/michelegiorgi/
 Tags: form, conversational, multistep, design form, gutenberg, block editor
 Requires at least: 5.8
-Tested up to: 5.9
-Stable tag: 1.5.4
+Tested up to: 6.0
+Stable tag: 1.5.5
 Requires PHP: 7.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.txt
@@ -61,6 +61,14 @@ You will find **Formality** menu in your WordPress admin screen.
 
 == Changelog ==
 
+= 1.5.5 =
+Release Date: May 9th, 2022
+
+* Fix navbar order on Safari 15
+* Fix input focus bug on long clicks
+* WordPress 6.0 compatibility
+* Gutenberg 13.1.0 compatibility
+
 = 1.5.4 =
 Release Date: Mar 27th, 2022
 

webpack.mix.js

@@ -16,7 +16,7 @@ mix
   .js('assets/scripts/public/index.js', 'scripts/formality-public.js')
   .js('assets/scripts/editor/index.js', 'scripts/formality-editor.js')
   .js('assets/scripts/admin/index.js', 'scripts/formality-admin.js')
-  .banner({ banner: 'Formality v1.5.4' });
+  .banner({ banner: 'Formality v1.5.5' });
 
 mix
   .copyWatched('assets/images/admin/**', 'dist/images/admin')