summaryrefslogtreecommitdiff
path: root/web/source/settings/components/combo-box.jsx
diff options
context:
space:
mode:
authorLibravatar f0x52 <f0x@cthu.lu>2022-11-25 15:49:48 +0100
committerLibravatar GitHub <noreply@github.com>2022-11-25 15:49:48 +0100
commit665d902fd72ef4fffb273502b6f010a94a47e15b (patch)
tree8fb9eb7aec5cad2ccf96ae1ebe276f18ad0735c0 /web/source/settings/components/combo-box.jsx
parent[feature] `PATCH /api/v1/admin/custom_emojis/{id}` endpoint (#1061) (diff)
downloadgotosocial-665d902fd72ef4fffb273502b6f010a94a47e15b.tar.xz
[feature/frogend] modify local emoji (#1143)
* update danger button red * emoji category and image modification * debug bundles in dev * fix linting error
Diffstat (limited to 'web/source/settings/components/combo-box.jsx')
-rw-r--r--web/source/settings/components/combo-box.jsx15
1 files changed, 9 insertions, 6 deletions
diff --git a/web/source/settings/components/combo-box.jsx b/web/source/settings/components/combo-box.jsx
index 1e6293890..d69df55b1 100644
--- a/web/source/settings/components/combo-box.jsx
+++ b/web/source/settings/components/combo-box.jsx
@@ -26,16 +26,19 @@ const {
ComboboxPopover,
} = require("ariakit/combobox");
-module.exports = function ComboBox({state, items, label, placeHolder}) {
+module.exports = function ComboBox({state, items, label, placeHolder, children}) {
return (
<div className="form-field combobox-wrapper">
<label>
{label}
- <Combobox
- state={state}
- placeholder={placeHolder}
- className="combobox input"
- />
+ <div className="row">
+ <Combobox
+ state={state}
+ placeholder={placeHolder}
+ className="combobox input"
+ />
+ {children}
+ </div>
</label>
<ComboboxPopover state={state} className="popover">
{items.map(([key, value]) => (