Merge branch 'master' into release

Author: atanas-dev

DEVELOPMENT.md

@@ -1,12 +1,38 @@
-### Internal Glossary
+# Release Guide
 
-#### `value_set`
+## `htmlburger/carbon-fields`
+
+1. Merge all changes for the new version into `master`
+1. Bump version numbers in `config.php` and `package.json` according to SemVer
+1. Commit bumped version changes to `master`
+1. Checkout `release`
+1. Merge `master` into `release`. NEVER merge `release` into any other branch - only merge branches INTO `release`.
+1. Run `npm install && npm run build`
+1. You should now have changes ONLY in the /assets/dist/ directory - any changes outside this directory mean that you have a dirty working copy. Never commit anything else into `release` except /assets/dist/ changes.
+1. Commit the /assets/dist/ changes to `release`
+1. `git push --all`
+1. Create a new release in [Github](https://github.com/htmlburger/carbon-fields-plugin/releases/new) from the `release` branch
+1. Enter the new version you set in `config.php` for `Tag version` and `Title`
+1. Add a changelog for `Description`
+1. Click `Publish release`
+
+## `htmlburger/carbon-fields-plugin`
+
+1. Update the version in `carbon-fields-plugin.php` and `composer.json` for `htmlburger/carbon-fields` to match the newly released version
+1. Commit to `master`
+1. Create a new release in [Github](https://github.com/htmlburger/carbon-fields-plugin/releases/new) from the `release` branch
+1. Enter the new version for `Tag version` and `Title` (you can skip the changelog)
+1. Click `Publish release`
+
+# Internal Glossary
+
+## `value_set`
 
 Represents a single field value. `Complex_Field` uses a `value_tree` instead which contains a `value_set` for every child field including the `Complex_Field` itself.
 
 _Note: The `Value_Set` class will always return a fully formatted `value_set` with all of it's properties OR `null`_
 
-##### Schema
+### Schema
 
 	array(
 		array(

assets/css/modules/_fields.complex.css

@@ -34,7 +34,7 @@
 .carbon-groups-holder .carbon-group-actions a:focus { box-shadow: none; outline: none; }
 .carbon-groups-holder .carbon-group-actions a:before { display: block; text-indent: 0; }
 
-.carbon-groups-holder .collapsed .carbon-btn-collapse:before { content: '\f140'; }
+.carbon-groups-holder > .collapsed > .carbon-group-actions > .carbon-btn-collapse:before { content: '\f140'; }
 
 .carbon-groups-holder .carbon-group-actions .carbon-btn-remove:hover { color: $color-border-darkgrey; }
 
@@ -110,8 +110,8 @@
 .carbon-empty-row:not(.carbon-empty-row-visible) ~ .layout-tabbed-horizontal + .carbon-actions,
 .carbon-empty-row:not(.carbon-empty-row-visible) ~ .layout-tabbed-vertical + .carbon-actions { display: none !important; }
 
-.layout-tabbed-horizontal .collapsed > .fields-container,
-.layout-tabbed-vertical .collapsed > .fields-container { display: flex; }
+.layout-tabbed-horizontal > .carbon-groups-holder > .collapsed > .fields-container,
+.layout-tabbed-vertical > .carbon-groups-holder > .collapsed > .fields-container { display: flex; }
 
 /*  Vertical Tabbed Layout  */
 

assets/js/fields/sagas/validation.js

@@ -75,7 +75,10 @@ export function* workerValidate(validator, fieldId, debounce, action) {
 
 	// Perform the validation.
 	let error = yield call(validator, field);
-	error = yield call(userValidateField, fieldId, error);
+	const userError = yield call(userValidateField, fieldId, error);
+	if ( ! isUndefined(userError) ) {
+		error = userError;
+	}
 
 	// Update the UI.
 	if (isNull(error)) {

config.php

@@ -4,7 +4,7 @@
 
 # Define version constant
 if ( ! defined( __NAMESPACE__ . '\VERSION' ) ) {
-	define( __NAMESPACE__ . '\VERSION', '2.0.1' );
+	define( __NAMESPACE__ . '\VERSION', '2.0.3' );
 }
 
 # Define root directory

package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-fields",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "WordPress developer-friendly custom fields for post types, taxonomy terms, users, comments, widgets, options, navigation menus and more.",
   "main": "index.js",
   "directories": {