← All changes | includes/Frontend/Form/View/Theme/Fields/ButtonField.php +50 -28 2.10.0 → 3.3.1 View file →

		@@ -12,9 +12,9 @@
12	12	}
13	13
14	14	private static function getBtnClass($btnTyp)
15	15	{
16		- switch($btnTyp) {
	16	+ switch ($btnTyp) {
17	17	case 'save-draft':
18	18	return 'bf-trigger-form-abandonment';
19	19	case 'next-step':
20	20	return 'next-step-btn';
		@@ -25,9 +25,9 @@
25	25	}
26	26
27	27	private static function getBtnTyp($btnTyp)
28	28	{
29		- switch($btnTyp) {
	29	+ switch ($btnTyp) {
30	30	case 'submit':
31	31	case 'reset':
32	32	return $btnTyp;
33	33	default:
		@@ -44,31 +44,48 @@
44	44	$btnSufIcn = $fieldHelpers->icon('btnSufIcn', 'btn-suf-i');
45	45	$disabled = $fieldHelpers->disabled();
46	46	// $name = $field->btnTyp === 'submit' ? 'name="bit-form-submit-btn"' : '';
47	47	$name = $fieldHelpers->name();
48		- $btnSpinner = '<span class="bf-spinner d-none"></span>';
	48	+ $btnSpinner = '<span class="bf-spinner d-none" aria-hidden="true"></span>';
49	49	$btnClass = self::getBtnClass($field->btnTyp);
50	50	$btnTyp = self::getBtnTyp($field->btnTyp);
	51	+ $ariaDescribedBy = $fieldHelpers->ariaDescribedBy();
51	52
52		- return <<<BUTTONFIELD
53		- <div
54		- {$fieldHelpers->getCustomAttributes('inp-fld-wrp')}
55		- class="{$fieldHelpers->getAtomicCls('inp-fld-wrp')} {$fieldHelpers->getCustomClasses('inp-fld-wrp')}"
	53	+ return sprintf(
	54	+ '<div
	55	+ %1$s
	56	+ class="%2$s %3$s"
56	57	>
57	58	<button
58		- {$fieldHelpers->getCustomAttributes('btn')}
59		- class="{$fieldHelpers->getAtomicCls('btn')} {$fieldHelpers->getCustomClasses('btn')} {$btnClass}"
60		- type="{$btnTyp}"
61		- {$name}
62		- {$disabled}
	59	+ %4$s
	60	+ class="%5$s %6$s %7$s"
	61	+ type="%8$s"
	62	+ %9$s
	63	+ %10$s
	64	+ %11$s
63	65	>
64		- {$btnPreIcn}
65		- {$fieldHelpers->kses_post($fieldHelpers->renderHTMR($field->txt))}
66		- {$btnSufIcn}
67		- {$btnSpinner}
	66	+ %12$s
	67	+ %13$s
	68	+ %14$s
	69	+ %15$s
68	70	</button>
69		- </div>
70		-BUTTONFIELD;
	71	+ </div>',
	72	+ $fieldHelpers->getCustomAttributes('inp-fld-wrp'), // 1
	73	+ $fieldHelpers->getAtomicCls('inp-fld-wrp'), // 2
	74	+ $fieldHelpers->getCustomClasses('inp-fld-wrp'), // 3
	75	+ $fieldHelpers->getCustomAttributes('btn'), // 4
	76	+ $fieldHelpers->getAtomicCls('btn'), // 5
	77	+ $fieldHelpers->getCustomClasses('btn'), // 6
	78	+ $btnClass, // 7
	79	+ $btnTyp, // 8
	80	+ $name, // 9
	81	+ $disabled, // 10
	82	+ $ariaDescribedBy, // 11
	83	+ $btnPreIcn, // 12
	84	+ $fieldHelpers->kses_post($fieldHelpers->renderHTMR($field->txt)), // 13
	85	+ $btnSufIcn, // 14
	86	+ $btnSpinner // 15
	87	+ );
71	88	}
72	89
73	90	private static function helperTxt($field, $rowID, $field_name, $form_atomic_Cls_map, $formID, $error = null, $value = null)
74	91	{
		@@ -76,19 +93,24 @@
76	93	$hlpPreIcn = $fieldHelpers->icon('hlpPreIcn', 'hlp-txt-pre-i');
77	94	$hlpSufIcn = $fieldHelpers->icon('hlpSufIcn', 'hlp-txt-suf-i');
78	95	$hlpTxt = isset($field->helperTxt) ? $fieldHelpers->renderHTMR($field->helperTxt) : '';
79	96
80		- $helperTxt = <<<HELPERTXT
81		- <div
82		- {$fieldHelpers->getCustomAttributes('hlp-txt')}
83		- class="{$fieldHelpers->getAtomicCls('hlp-txt')} {$fieldHelpers->getCustomClasses('hlp-txt')}"
	97	+ $helperTxt = sprintf(
	98	+ '<div
	99	+ %1$s
	100	+ class="%2$s %3$s"
84	101	>
85		- {$hlpPreIcn}
86		- {$fieldHelpers->kses_post($hlpTxt)}
87		- {$hlpSufIcn}
88		- </div>
89		-
90		-HELPERTXT;
	102	+ %4$s
	103	+ %5$s
	104	+ %6$s
	105	+ </div>',
	106	+ $fieldHelpers->getCustomAttributes('hlp-txt'),
	107	+ $fieldHelpers->getAtomicCls('hlp-txt'),
	108	+ $fieldHelpers->getCustomClasses('hlp-txt'),
	109	+ $hlpPreIcn,
	110	+ $fieldHelpers->kses_post($hlpTxt),
	111	+ $hlpSufIcn
	112	+ );
91	113
92	114	return property_exists($field, 'helperTxt') ? $helperTxt : '';
93	115	}
94	116	}