Skip to content
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

[DUOS-2898] Switch more hyperscript-helpers to JSX #2470

Merged
merged 10 commits into from
Feb 29, 2024
Merged

[DUOS-2898] Switch more hyperscript-helpers to JSX #2470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6cadc73
refactor: switch DataUseAgreements to JSX
fboulnois Feb 23, 2024
d859062
refactor: switch TranslatedDulModal to JSX
fboulnois Feb 26, 2024
6211723
refactor: switch CollaboratorList to JSX
fboulnois Feb 26, 2024
66170c7
refactor: switch CollaboratorSummary to JSX
fboulnois Feb 26, 2024
5db455c
refactor: switch SearchSelectOrText to JSX
fboulnois Feb 26, 2024
bbbfc8d
refactor: switch DucAddendum to JSX
fboulnois Feb 26, 2024
920a132
refactor: switch DatasetUpdate to JSX
fboulnois Feb 26, 2024
1ab7f15
refactor: switch ds_study_information to JSX
fboulnois Feb 26, 2024
92b377c
refactor: switch ConsentTextGenerator to JSX
fboulnois Feb 26, 2024
5daddbc
refactor: switch ResearchPurposeStatement to JSX
fboulnois Feb 27, 2024
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
98 changes: 47 additions & 51 deletions src/components/SearchSelectOrText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useState, useEffect, useRef } from 'react';
import {div, input, span, a, ul, li } from 'react-hyperscript-helpers';
import {isEqual} from 'lodash';
import {find} from 'lodash/fp';

Expand Down Expand Up @@ -68,57 +68,53 @@ export const SearchSelectOrText = (props) => {


return (
div({ className: 'dropdown select-dropdown', id, name: label }, [
a({
className: `btn select-btn btn-secondary dropdown-toggle ${errored ? 'errored' : ''}`,
role: 'button',
id: 'dropdownMenuLink',
'data-toggle': 'dropdown',
'aria-haspopup': true,
'aria-expanded': false,
onClick: onOpen,
disabled
}, [
div({
style: { width: '100%' }
}, [
span([currentDisplay]),
span({ className: 'caret select-caret caret-margin', style: { right: '2%' } })
])
]),
div({
className: 'dropdown-menu select-dropdown-menu',
onBlur: () => {
selectManual(searchTerms.current.value);
onBlur && onBlur();
}
}, [
input({
type: 'text',
placeholder: searchPlaceholder ? searchPlaceholder : 'Search...',
className: 'search-bar',
onChange:() => handleSearch(searchTerms),
onKeyDown: (e) => {
if (e.key == 'Enter') {
<div className="dropdown select-dropdown" id={id} name={label}>
<a
className={`btn select-btn btn-secondary dropdown-toggle ${errored ? 'errored' : ''}`}
role="button"
id="dropdownMenuLink"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
onClick={onOpen}
disabled={disabled}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this attribute is not allowed here (and indeed, there are other non-standard attributes scattered across the older hyperscript), but I favor keeping this (and others) here to lessen the potential for regressions.

>
<div style={{ width: '100%' }}>
<span>{currentDisplay}</span>
<span className="caret select-caret caret-margin" style={{ right: '2%' }} />
</div>
</a>
<div className="dropdown-menu select-dropdown-menu" onBlur={() => {
selectManual(searchTerms.current.value);
onBlur && onBlur();
}}>
<input
type="text"
placeholder={searchPlaceholder ? searchPlaceholder : 'Search...'}
className="search-bar"
onChange={() => handleSearch(searchTerms)}
onKeyDown={(e) => {
if (e.key === 'Enter') {
selectManual(searchTerms.current.value);
}
},
ref: searchTerms
}),
div({
className: 'dropdown-divider'
}),
ul({ style: { paddingLeft: 0 } }, filteredList.map(item => {
return li({
className: item.key === currentSelection
? 'dropdown-item select-dropdown-item active'
: 'dropdown-item select-dropdown-item',
onMouseUp: () => {
select(item.key);
},
}, [item.displayText]);
}))
])
])
}}
ref={searchTerms}
/>
<div className="dropdown-divider" />
<ul style={{ paddingLeft: 0 }}>
{filteredList.map(item => (
<li
className={item.key === currentSelection ? 'dropdown-item select-dropdown-item active' : 'dropdown-item select-dropdown-item'}
onMouseUp={() => {
select(item.key);
}}
key={item.key}
>
{item.displayText}
</li>
))}
</ul>
</div>
</div>
);
};
Loading
Loading