← All changes
|
modules/atomic-widgets/styles/size-constants.php
+4
-38
4.1.0-beta3
→
4.0.0-dev3
View file →
| @@ -26,28 +26,8 @@ | ||
| 26 | 26 | const UNIT_CUSTOM = 'custom'; |
| 27 | 27 | |
| 28 | 28 | const DEFAULT_UNIT = self::UNIT_PX; |
| 29 | 29 | |
| 30 | - private const ORDER = [ | |
| 31 | - self::UNIT_PX, | |
| 32 | - self::UNIT_PERCENT, | |
| 33 | - self::UNIT_EM, | |
| 34 | - self::UNIT_REM, | |
| 35 | - self::UNIT_VW, | |
| 36 | - self::UNIT_VH, | |
| 37 | - self::UNIT_CH, | |
| 38 | - self::UNIT_VMIN, | |
| 39 | - self::UNIT_VMAX, | |
| 40 | - self::UNIT_DEG, | |
| 41 | - self::UNIT_RAD, | |
| 42 | - self::UNIT_GRAD, | |
| 43 | - self::UNIT_TURN, | |
| 44 | - self::UNIT_SECOND, | |
| 45 | - self::UNIT_MILLI_SECOND, | |
| 46 | - self::UNIT_AUTO, | |
| 47 | - self::UNIT_CUSTOM, | |
| 48 | - ]; | |
| 49 | - | |
| 50 | 30 | private const LENGTH_UNITS = [ |
| 51 | 31 | self::UNIT_PX, |
| 52 | 32 | self::UNIT_EM, |
| 53 | 33 | self::UNIT_REM, |
| @@ -85,10 +65,10 @@ | ||
| 85 | 65 | ]; |
| 86 | 66 | |
| 87 | 67 | private static function presets(): array { |
| 88 | 68 | return [ |
| 89 | - 'layout' => self::sort_by_preferred_order( self::NUMERIC_UNITS ), | |
| 90 | - 'spacing' => self::sort_by_preferred_order( self::NUMERIC_UNITS ), | |
| 69 | + 'layout' => self::NUMERIC_UNITS, | |
| 70 | + 'spacing' => self::NUMERIC_UNITS, | |
| 91 | 71 | 'position' => self::NUMERIC_UNITS, |
| 92 | 72 | 'typography' => self::NUMERIC_UNITS, |
| 93 | 73 | 'border' => self::NUMERIC_UNITS, |
| 94 | 74 | 'box_shadow' => self::NUMERIC_UNITS, |
| @@ -149,25 +129,15 @@ | ||
| 149 | 129 | ], |
| 150 | 130 | ]; |
| 151 | 131 | } |
| 152 | 132 | |
| 153 | - private static function sort_by_preferred_order( array $units ): array { | |
| 154 | - $index = array_flip( self::ORDER ); | |
| 155 | - | |
| 156 | - usort( $units, fn( $a, $b ) => | |
| 157 | - ( $index[ $a ] ?? PHP_INT_MAX ) <=> ( $index[ $b ] ?? PHP_INT_MAX ) | |
| 158 | - ); | |
| 159 | - | |
| 160 | - return $units; | |
| 161 | - } | |
| 162 | - | |
| 163 | 133 | public static function standard_units(): array { |
| 164 | - return self::sort_by_preferred_order( [ | |
| 134 | + return [ | |
| 165 | 135 | ...self::LENGTH_UNITS, |
| 166 | 136 | self::UNIT_PERCENT, |
| 167 | 137 | self::UNIT_AUTO, |
| 168 | 138 | self::UNIT_CUSTOM, |
| 169 | - ] ); | |
| 139 | + ]; | |
| 170 | 140 | } |
| 171 | 141 | |
| 172 | 142 | public static function all_supported_units(): array { |
| 173 | 143 | return [ |
| @@ -206,12 +176,8 @@ | ||
| 206 | 176 | } |
| 207 | 177 | |
| 208 | 178 | public static function time(): array { |
| 209 | 179 | return self::by_group( 'time' ); |
| 210 | - } | |
| 211 | - | |
| 212 | - public static function angle(): array { | |
| 213 | - return self::by_group( 'angle' ); | |
| 214 | 180 | } |
| 215 | 181 | |
| 216 | 182 | public static function layout(): array { |
| 217 | 183 | return self::get_preset( 'layout' ); |