From 678592fda912f877a4738aa9c583a0b1da3ea242 Mon Sep 17 00:00:00 2001
From: JoryHogeveen <jory.johan.hogeveen@gmail.com>
Date: Tue, 12 Feb 2019 23:18:25 +0100
Subject: [PATCH 1/3] Support optiongroups

---
 genesis-widget-column-classes.php | 86 ++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 25 deletions(-)

diff --git a/genesis-widget-column-classes.php b/genesis-widget-column-classes.php
index 648f9e8..4f2a9bd 100644
--- a/genesis-widget-column-classes.php
+++ b/genesis-widget-column-classes.php
@@ -261,6 +261,7 @@ public function action_ignore_genesis_notice() {
 	 *
 	 * @since   0.1.0
 	 * @since   1.3.0  Multi select support.
+	 * @since   1.4.0  Option group support.
 	 * @access  public
 	 * @param   array       $instance
 	 * @param   \WP_Widget  $widget
@@ -301,33 +302,11 @@ public function filter_widget_form_extend( $instance, $widget ) {
 		$row  = '<p style="border: 1px solid ' . $border . '; padding: 5px 10px; background-color: ' . $background . ';">';
 		$row .= '<label for="' . $widget->get_field_id( 'column-classes' ) . '">' . __( 'Width', self::$_domain ) . ': &nbsp;</label>';
 
-		$row_column = '';
-
-		$instance['column-classes'] = explode( ' ', $instance['column-classes'] );
-		$column_classes             = $this->get_column_classes();
-
-		if ( $this->select_multiple ) {
-			// Selected first.
-			$column_classes = array_replace( array_flip( $instance['column-classes'] ), $column_classes );
-		} else {
-			$instance['column-classes'] = array( $instance['column-classes'][0] );
-		}
-
-		foreach ( $column_classes as $class_name ) {
-			if ( ! empty( $class_name ) ) {
-				$class_label = $class_name;
-				$selected    = in_array( $class_name, $instance['column-classes'], true );
-				if ( $this->select_multiple ) {
-					$row_column .= '<label><input type="checkbox" name="' . $field_name . '[]" value="' . $class_name . '" ' . checked( $selected, true, false ) . '> ' . $class_label . '</label>';
-				} else {
-					$row_column .= '<option value="' . $class_name . '" ' . selected( $selected, true, false ) . '>' . $class_label . '</option>';
-				}
-			}
-		}
+		$column_class_options = $this->get_column_class_options( $instance, $widget );
 
 		if ( $this->select_multiple ) {
 			$row .= '<span id="' . $field_id . '" class="multiselect"><span>';
-			$row .= $row_column;
+			$row .= $column_class_options;
 			$row .= '</span></span> &nbsp; ';
 			?>
 <style>
@@ -369,7 +348,7 @@ public function filter_widget_form_extend( $instance, $widget ) {
 		} else {
 			$row .= '<select name="' . $field_name . '" id="' . $field_id . '">';
 			$row .= '<option value="">- ' . __( 'none', self::$_domain ) . ' -</option>';
-			$row .= $row_column;
+			$row .= $column_class_options;
 			$row .= '</select> &nbsp; ';
 		}
 
@@ -381,6 +360,63 @@ public function filter_widget_form_extend( $instance, $widget ) {
 		return $instance;
 	}
 
+	/**
+	 * Get the column class options HTML.
+	 *
+	 * @since   1.4.0
+	 * @access  public
+	 * @param   array       $instance
+	 * @param   \WP_Widget  $widget
+	 * @return  string
+	 */
+	public function get_column_class_options( $instance, $widget ) {
+
+		$field_name = $widget->get_field_name( 'column-classes' );
+
+		$instance['column-classes'] = explode( ' ', $instance['column-classes'] );
+		$column_classes             = $this->get_column_classes();
+
+		if ( $this->select_multiple ) {
+			// Selected first.
+			$column_classes = $this->sort_selected_column_classes( $column_classes, $instance['column-classes'] );
+		} else {
+			$instance['column-classes'] = array( $instance['column-classes'][0] );
+		}
+
+		$html = '';
+
+		foreach ( $column_classes as $group_name => $class_names ) {
+			if ( ! is_array( $class_names ) ) {
+				$group_name = false;
+			}
+			$class_names = (array) $class_names;
+			$options     = '';
+			foreach ( $class_names as $class_name ) {
+				if ( ! empty( $class_name ) ) {
+					$class_label = $class_name;
+					$selected    = in_array( $class_name, $instance['column-classes'], true );
+					if ( $this->select_multiple ) {
+						$options .= '<label><input type="checkbox" name="' . $field_name . '[]" value="' . $class_name . '" ' . checked( $selected, true, false ) . '> ' . $class_label . '</label>';
+					} else {
+						$options .= '<option value="' . $class_name . '" ' . selected( $selected, true, false ) . '>' . $class_label . '</option>';
+					}
+				}
+			}
+			if ( $options ) {
+				if ( $group_name ) {
+					if ( $this->select_multiple ) {
+						$options = '<strong>' . $group_name . '</strong>' . $options . '';
+					} else {
+						$options = '<optgroup label="' . $group_name . '">' . $options . '</optgroup>';
+					}
+				}
+				$html .= $options;
+			}
+		}
+
+		return $html;
+	}
+
 	/**
 	 * Add the new fields to the update instance.
 	 *

From 6c2fe55c54f7f04cf423863e204e6a0026efc3c2 Mon Sep 17 00:00:00 2001
From: JoryHogeveen <jory.johan.hogeveen@gmail.com>
Date: Tue, 12 Feb 2019 23:18:39 +0100
Subject: [PATCH 2/3] Sort optiongroups based on selection if multiple
 selections are allowed

---
 genesis-widget-column-classes.php | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/genesis-widget-column-classes.php b/genesis-widget-column-classes.php
index 4f2a9bd..8ce800e 100644
--- a/genesis-widget-column-classes.php
+++ b/genesis-widget-column-classes.php
@@ -417,6 +417,48 @@ public function get_column_class_options( $instance, $widget ) {
 		return $html;
 	}
 
+	/**
+	 * Sort column classes based on selection.
+	 *
+	 * @since   1.4.0
+	 * @access  public
+	 * @param   array  $classes
+	 * @param   array  $selected
+	 * @return  array
+	 */
+	public function sort_selected_column_classes( $classes, $selected ) {
+		$values = array();
+		$groups = array();
+
+		// Separate option groups from single values.
+		foreach ( $classes as $key => $value ) {
+			if ( is_array( $value ) ) {
+				$groups[ $key ] = $value;
+			} else {
+				$values[ $key ] = $value;
+			}
+		}
+
+		// Same keys as values.
+		$values   = array_combine( $values, $values );
+		$selected = array_combine( $selected, $selected );
+
+		foreach ( $selected as $class ) {
+			// Remove from groups.
+			foreach ( $groups as $group => $classes ) {
+				$key = array_search( $class, $classes, true );
+				if ( false !== $key ) {
+					unset( $groups[ $group ][ $key ] );
+				}
+			}
+		}
+
+		// Selected first.
+		$values = array_replace( $selected, $values );
+
+		return array_merge( $values, $groups );
+	}
+
 	/**
 	 * Add the new fields to the update instance.
 	 *

From e4cf70fdf465f8f1c268ee29ba3053a4b8b3ab02 Mon Sep 17 00:00:00 2001
From: JoryHogeveen <jory.johan.hogeveen@gmail.com>
Date: Tue, 12 Feb 2019 23:24:51 +0100
Subject: [PATCH 3/3] Remove unnecessary if statement.

---
 genesis-widget-column-classes.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/genesis-widget-column-classes.php b/genesis-widget-column-classes.php
index 8ce800e..cf8c36c 100644
--- a/genesis-widget-column-classes.php
+++ b/genesis-widget-column-classes.php
@@ -391,15 +391,13 @@ public function get_column_class_options( $instance, $widget ) {
 			}
 			$class_names = (array) $class_names;
 			$options     = '';
-			foreach ( $class_names as $class_name ) {
-				if ( ! empty( $class_name ) ) {
-					$class_label = $class_name;
-					$selected    = in_array( $class_name, $instance['column-classes'], true );
-					if ( $this->select_multiple ) {
-						$options .= '<label><input type="checkbox" name="' . $field_name . '[]" value="' . $class_name . '" ' . checked( $selected, true, false ) . '> ' . $class_label . '</label>';
-					} else {
-						$options .= '<option value="' . $class_name . '" ' . selected( $selected, true, false ) . '>' . $class_label . '</option>';
-					}
+			foreach ( array_filter( $class_names ) as $class_name ) {
+				$class_label = $class_name;
+				$selected    = in_array( $class_name, $instance['column-classes'], true );
+				if ( $this->select_multiple ) {
+					$options .= '<label><input type="checkbox" name="' . $field_name . '[]" value="' . $class_name . '" ' . checked( $selected, true, false ) . '> ' . $class_label . '</label>';
+				} else {
+					$options .= '<option value="' . $class_name . '" ' . selected( $selected, true, false ) . '>' . $class_label . '</option>';
 				}
 			}
 			if ( $options ) {