Skip to content

Input group implementation #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Input group implementation #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d9afcd
Input group implementation
joserick Apr 12, 2020
67fcfe2
Fix label
joserick Apr 12, 2020
60d30d4
Added attributes
joserick Apr 28, 2020
869e329
Fix syntax
joserick Apr 28, 2020
cff8279
Fix function parameter
joserick May 19, 2020
9624ae5
Added use brackets for multiple attribute
joserick May 19, 2020
9db8ec8
Added function optgroup
joserick May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 127 additions & 18 deletions src/FormBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,27 @@ public function render(): string

private function renderFormOpen(): string
{
extract($this->get('id', 'method', 'url', 'formMultipart', 'formInline', 'autocomplete'));
extract($this->get('id', 'method', 'url', 'formMultipart', 'formInline', 'autocomplete', 'attrs'));

if (!$method) {
$method = 'post';
}

$enctype = $formMultipart ? 'multipart/form-data' : null;

$attrs = $this->buildHtmlAttrs([
$attrs = $attrs ?? [];
$attrs['class'] = $this->createAttrsList(
($formInline ? 'form-inline' : null),
$attrs['class'] ?? null
);

$attrs = $this->buildHtmlAttrs(array_merge($attrs, [
'method' => in_array($method, ['get', 'post']) ? $method : 'post',
'action' => $url,
'enctype' => $enctype,
'autocomplete' => $autocomplete,
'class' => $formInline ? 'form-inline' : null,
'id' => $id
]);
]));

$output = '<form ' . $attrs . '>';

Expand Down Expand Up @@ -140,14 +145,14 @@ private function renderInput(): string

private function renderSelect(): string
{
extract($this->get('options'));
extract($this->get('options', 'placeholder'));

$fieldValue = $this->getValue();
$arrValues = is_array($fieldValue) ? $fieldValue : [$fieldValue];
$optionsList = '';
foreach ($options as $value => $label) {
$attrs = $this->buildHtmlAttrs(['value' => $value, 'selected' => in_array($value, $arrValues)], false);
$optionsList .= '<option ' . $attrs . '>' . $label . '</option>';
$optionsList = $this->getSelectOptions($arrValues, $options);

if ($placeholder) {
$optionsList = '<option value="" disabled hidden selected>' . $placeholder . '</option>' . $optionsList;
}

$attributes = $this->getInputAttributes();
Expand Down Expand Up @@ -252,6 +257,9 @@ private function getInputAttributes(): array
$attributes['value'] = $this->getValue();
} else {
$attributes['multiple'] = $multiple;
if ($multiple) {
$attributes['name'] .= '[]';
}
}

// If the field is a hidden field, we don't need add more attributes
Expand All @@ -263,7 +271,7 @@ private function getInputAttributes(): array
if ($this->hasOldInput()) {
$isChecked = old($name) === $value;
} else {
$isChecked = isset($formData[$name]) ? $formData[$name] === $value : $checked;
$isChecked = isset($formData[$name]) ? boolval($formData[$name]) === boolval($value) : $checked;
}
$attributes['checked'] = $isChecked;
}
Expand All @@ -281,23 +289,119 @@ private function getInputAttributes(): array
]);
}

private function getSelectOptions($arrValues, $options, $optgroup_label = '')
{
extract($this->get('optgroup'));

$optionsList = '';
foreach ($options as $value => $label) {
if (is_array($label)) {
$optionsList .= '<optgroup label="' . $value . '">'
. $this->getSelectOptions($arrValues, $label, $value.';') . '</optgroup>';
}else{
if ($optgroup) {
$value = $optgroup_label.$value;
}
$attrs = $this->buildHtmlAttrs([
'value' => $value,
'selected' => in_array($value, $arrValues)
], false);
$optionsList .= '<option ' . $attrs . ($value ? '>' : ' disabled hidden>') . $label . '</option>';
}
}
return $optionsList;
}

private function renderLabel(): string
{
extract($this->get('label', 'formInline', 'render'));
extract($this->get('label', 'formInline', 'render', 'labelAttrs'));

if (is_null($label)) {
return '';
}

$class = in_array($render, ['checkbox', 'radio']) ? 'form-check-label' : '';
if ($formInline) {
$class = join(' ', [$class, 'mx-sm-2']);
}

$id = $this->getId();
$attrs = $this->buildHtmlAttrs([
'for' => $id,
'class' => $class
], false);
$attrs = $labelAttrs ?? [];
$attrs['class'] = $this->createAttrsList(
$attrs['class'] ?? null,
$class
);
$attrs['for'] = $this->getId();
$attrs = $this->buildHtmlAttrs($attrs, false);
return '<label ' . $attrs . '>' . $this->getText($label) . '</label>';
}

private function wrapperInputGroup(string $input): string
{
extract($this->get('append', 'prepend', 'formInline', 'wrapperGroupAttrs', 'type', 'options'));

if ((!$append && !$prepend) || !(in_array($type, ['text', 'date', 'time', 'tel', 'url']) || is_array($options))) {
return $input;
}

$output = ($prepend ? $this->getInputGroup('prepend', $prepend) : '') . $input;
$output .= $append ? $this->getInputGroup('append', $append) : '';
$attrs = $wrapperGroupAttrs ?? [];
$attrs['class'] = $this->createAttrsList(
'input-group',
$attrs['class'] ?? null
);
$attrs = $this->buildHtmlAttrs($attrs, false);

if (!$formInline) {
$output = '<div ' . $attrs. '>' . $output . '</div>';
}

return $output;
}

private function getInputGroup(string $type, $value): string
{
$wrapperType = 'wrapper'. ucwords($type) . 'Attrs';
extract($this->get('onlyInput', $wrapperType));

$attrs = $$wrapperType ?? [];
$attrs['class'] = $this->createAttrsList(
'input-group-' . $type,
$attrs['class'] ?? null
);

$attrs = $this->buildHtmlAttrs($attrs, false);
$output = '<div ' . $attrs . '>';

if (is_array($value)) {
foreach ($value as $text) {
$output .= $this->getInputGroupText($type, $text);
}
}else{
$output .= $this->getInputGroupText($type, $value);
}

return $output . '</div>';
}

private function getInputGroupText(string $type, string $value): string
{
extract($this->get($type . 'Attrs', $type . 'Style'));

$attrs = ${$type . 'Attrs'} ?? [];
$attrs['class'] = $this->createAttrsList(
( ${$type . 'Style'} ? 'input-group-text' : ''),
$attrs['class'] ?? null
);

if (!array_key_exists('id', $attrs)) {
$attrs['id'] = $type . '-' . $this->getId();
}

$attrs = $this->buildHtmlAttrs($attrs, false);
return '<div ' . $attrs . '>' . $this->getText($value) . '</div>';
}

private function getText($key)
{
extract($this->get('formLocale'));
Expand Down Expand Up @@ -339,13 +443,18 @@ private function wrapperInput(string $input): string
$formInline ? 'input-group' : 'form-group'
);
$attributes = $this->buildHtmlAttrs($attrs, false);
$input = $this->wrapperInputGroup($input);

return '<div ' . $attributes . '>' . $label . $input . $helpText . $error . '</div>';
}

private function wrapperRadioCheckbox(string $input): string
{
extract($this->get('inline', 'name', 'wrapperAttrs'));
extract($this->get('inline', 'name', 'wrapperAttrs', 'onlyInput'));

if ($onlyInput) {
return $input;
}

$attrs = $wrapperAttrs ?? [];
$attrs['class'] = $this->createAttrsList(
Expand Down Expand Up @@ -398,7 +507,7 @@ private function getValue()
}

if ($this->hasOldInput()) {
return old($name, $value);
return old(preg_replace("/\[\]/", "", $name), $value);
}

$fromFill = $formData[$name] ?? null;
Expand Down
88 changes: 83 additions & 5 deletions src/FormService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ public function url(string $url = null): FormService
* Set route for links and form action
*
* @param string $route
* @param array $params
* @param array|string $params
* @return FormService
*/
public function route(string $route, array $params = []): FormService
public function route(string $route, $params = []): FormService
{
return $this->_set('url', route($route, $params));
}
Expand Down Expand Up @@ -364,6 +364,28 @@ public function max($value)
return $this->_set('max', $value);
}

/**
* Set a append for a field
*
* @param mixed $value
* @return FormService
*/
public function append(string $value, array $attrs = null, bool $style = true): FormService
{
return $this->_set('append', $value)->_set('appendAttrs', $attrs)->_set('appendStyle', $style);
}

/**
* Set a prepend for a field
*
* @param mixed $value
* @return FormService
*/
public function prepend(string $value, array $attrs = null, bool $style = true): FormService
{
return $this->_set('prepend', $value)->_set('prependAttrs', $attrs)->_set('prependStyle', $style);
}

/**
* Create a hidden input
*
Expand Down Expand Up @@ -469,11 +491,12 @@ public function textarea(string $name = null, $label = null, string $default = n
* Set a label
*
* @param string $label
* @param array $attrs
* @return FormService
*/
public function label($label): FormService
public function label($label, array $attrs = []): FormService
{
return $this->_set('label', $label);
return $this->_set('label', $label)->labelAttrs($attrs);
}

/**
Expand Down Expand Up @@ -538,6 +561,17 @@ public function checked(bool $checked = true): FormService
return $this->_set('checked', $checked);
}

/**
* Set optgroup label inside options value
*
* @param bool $optgroup
* @return FormService
*/
public function optgroup(bool $optgroup = true): FormService
{
return $this->_set('optgroup', $optgroup);
}

/**
* Set a input value
*
Expand Down Expand Up @@ -802,10 +836,21 @@ public function attrs(array $attrs = []): FormService
return $this->_set('attrs', $attrs);
}

/**
* Set custom attributes for a label input
*
* @param array $attrs
* @return FormService
*/
public function labelAttrs(array $attrs = []): FormService
{
return $this->_set('labelAttrs', $attrs);
}

/**
* Disable input states (valid and invalid classes) and error message
*
* @param string $disable
* @param bool $disable
* @return FormService
*/
public function disableValidation(bool $disable = true): FormService
Expand All @@ -824,6 +869,39 @@ public function wrapperAttrs(array $attrs = []): FormService
return $this->_set('wrapperAttrs', $attrs);
}

/**
* Set custom attributes for a wrapper input group
*
* @param array $attrs
* @return FormService
*/
public function wrapperGroupAttrs(array $attrs = []): FormService
{
return $this->_set('wrapperGroupAttrs', $attrs);
}

/**
* Set custom attributes for a wrapper append input
*
* @param array $attrs
* @return FormService
*/
public function wrapperAppendAttrs(array $attrs = []): FormService
{
return $this->_set('wrapperAppendAttrs', $attrs);
}

/**
* Set custom attributes for a wrapper prepend input
*
* @param array $attrs
* @return FormService
*/
public function wrapperPrependAttrs(array $attrs = []): FormService
{
return $this->_set('wrapperPrependAttrs', $attrs);
}

/**
* Create radio or checkbox input
*
Expand Down