Skip to content

TSJR-217 fix skills selector -> dev #944

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

Merged
merged 3 commits into from
Nov 16, 2023
Merged

TSJR-217 fix skills selector -> dev #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bd1e62
Update react-select@5.8.0
vas3a Nov 16, 2023
aa7d4b2
TSJR-217 - move skill selector menu into separate portal
vas3a Nov 16, 2023
5570417
TSJR-217 - update onboarding to make skills selector work
vas3a Nov 16, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"react-responsive-modal": "^6.2.0",
"react-router-dom": "^6.4.2",
"react-scripts": "5.0.1",
"react-select": "^5.5.0",
"react-select": "^5.8.0",
"react-spinners": "^0.13.6",
"react-stickynode": "^1.4.1",
"react-toastify": "^9.0.8",
Expand Down
13 changes: 8 additions & 5 deletions src/apps/onboarding/src/pages/onboarding/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import classNames from 'classnames'

import { routerContext, RouterContextData } from '~/libs/core'
import { Member } from '~/apps/talent-search/src/lib/models'
import { SharedSwrConfig } from '~/libs/shared'
import { EnvironmentConfig } from '~/config'

import { onboardRouteId } from '../../onboarding.routes'
Expand Down Expand Up @@ -52,11 +53,13 @@ const OnboardingContent: FC<{
}

export const OnboardingWrapper: FC<{}> = () => (
<div className={classNames(styles.blockWrapper, 'd-flex flex-column align-items-center')}>
<Provider store={store}>
<OnboardingContent />
</Provider>
</div>
<SharedSwrConfig>
<div className={classNames(styles.blockWrapper, 'd-flex flex-column align-items-center')}>
<Provider store={store}>
<OnboardingContent />
</Provider>
</div>
</SharedSwrConfig>
)

export default OnboardingWrapper
4 changes: 3 additions & 1 deletion src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
}

.skillsModalBody {
overflow: visible !important;
:global(.ms--value-container) {
max-height: 90px;
}
}

.principalIntroLink {
Expand Down
9 changes: 5 additions & 4 deletions ...lib/components/form/form-groups/form-input/input-multiselect/InputMultiselect.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,14 @@
font-weight: $font-weight-medium;
}
}
}

.ms {
&:global(__menu-portal).ms:global(__menu-portal) {
z-index: 1001;
}
&:global(__menu) {
top: 100%;
left: 0;
position: absolute;
width: 100%;
z-index: 1;
background-color: $tc-white;
border-radius: 4px;
box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);
Expand Down
14 changes: 14 additions & 0 deletions ...libs/ui/lib/components/form/form-groups/form-input/input-multiselect/InputMultiselect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ const dropdownIndicator = (dropdownIcon: ReactNode): FC => (props: any) => (
)

const InputMultiselect: FC<InputMultiselectProps> = props => {
// we need to create a portal to append our menus so they are always visible
const menuPortalTarget = useMemo(() => {
const el = document.getElementById('input-ms-menu-target-portal') ?? document.createElement('div')
el.id = 'input-ms-menu-target-portal'

if (!document.body.contains(el)) {
document.body.append(el)
}

return el
}, [])

const asynSelectRef = useRef<any>()
const placeholder = useMemo(() => (
(props.value?.length as number) > 0 ? props.additionalPlaceholder ?? 'Add more...' : props.placeholder
Expand Down Expand Up @@ -132,6 +144,7 @@ const InputMultiselect: FC<InputMultiselectProps> = props => {
props.useWrapper === false && styles.multiSelectWrap,
)
}
classNames={{ valueContainer: () => 'ms--value-container' }}
ref={props.inputRef ?? asynSelectRef}
classNamePrefix={styles.ms}
unstyled
Expand All @@ -156,6 +169,7 @@ const InputMultiselect: FC<InputMultiselectProps> = props => {
openMenuOnClick={false}
onKeyDown={handleKeyPress}
filterOption={props.filterOption}
menuPortalTarget={menuPortalTarget}
/>
)

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16417,10 +16417,10 @@ react-scripts@5.0.1:
optionalDependencies:
fsevents "^2.3.2"

react-select@^5.5.0:
version "5.7.0"
resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.0.tgz#82921b38f1fcf1471a0b62304da01f2896cd8ce6"
integrity sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==
react-select@^5.8.0:
version "5.8.0"
resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.8.0.tgz#bd5c467a4df223f079dd720be9498076a3f085b5"
integrity sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==
dependencies:
"@babel/runtime" "^7.12.0"
"@emotion/cache" "^11.4.0"
Expand Down