-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1853 from catsoup11789/24.07.00
accessibility fixes
- Loading branch information
Showing
23 changed files
with
202 additions
and
254 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 39 additions & 89 deletions
128
code/aspen_app/src/screens/GroupedWork/OverDriveSettings.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,95 +1,45 @@ | ||
| import { | ||
| Button, | ||
| Checkbox, | ||
| FormControl, | ||
| Input, | ||
| Modal, | ||
| Stack, | ||
| } from "native-base"; | ||
| import React from "react"; | ||
| import { Button, Checkbox, FormControl, Input, Modal, Stack } from 'native-base'; | ||
| import React from 'react'; | ||
|
|
||
| // custom components and helper files | ||
| import { updateOverDriveEmail } from "../../util/accountActions"; | ||
| import {getTermFromDictionary} from '../../translations/TranslationService'; | ||
| import { updateOverDriveEmail } from '../../util/accountActions'; | ||
| import { getTermFromDictionary } from '../../translations/TranslationService'; | ||
|
|
||
| export const GetOverDriveSettings = (props) => { | ||
| const { | ||
| promptTitle, | ||
| promptItemId, | ||
| promptSource, | ||
| promptPatronId, | ||
| promptForOverdriveEmail, | ||
| libraryUrl, | ||
| showOverDriveSettings, | ||
| handleOverDriveSettings, | ||
| showAlert, | ||
| setEmail, | ||
| setRememberPrompt, | ||
| overdriveEmail, | ||
| language | ||
| } = props; | ||
| const { promptTitle, promptItemId, promptSource, promptPatronId, promptForOverdriveEmail, libraryUrl, showOverDriveSettings, handleOverDriveSettings, showAlert, setEmail, setRememberPrompt, overdriveEmail, language } = props; | ||
|
|
||
| return ( | ||
| <Modal | ||
| isOpen={showOverDriveSettings} | ||
| onClose={() => handleOverDriveSettings(false)} | ||
| avoidKeyboard | ||
| closeOnOverlayClick={false} | ||
| > | ||
| <Modal.Content> | ||
| <Modal.CloseButton /> | ||
| <Modal.Header>{promptTitle}</Modal.Header> | ||
| <Modal.Body mt={4}> | ||
| <FormControl> | ||
| <Stack> | ||
| <FormControl.Label> | ||
| {getTermFromDictionary(language, 'overdrive_email_field')} | ||
| </FormControl.Label> | ||
| <Input | ||
| autoCapitalize="none" | ||
| autoCorrect={false} | ||
| id="overdriveEmail" | ||
| onChangeText={(text) => setEmail(text)} | ||
| /> | ||
| <Checkbox | ||
| value="yes" | ||
| my={2} | ||
| id="promptForOverdriveEmail" | ||
| onChange={(isSelected) => setRememberPrompt(isSelected)} | ||
| > | ||
| {getTermFromDictionary(language, 'remember_settings')} | ||
| </Checkbox> | ||
| </Stack> | ||
| </FormControl> | ||
| </Modal.Body> | ||
| <Modal.Footer> | ||
| <Button.Group space={2} size="md"> | ||
| <Button | ||
| colorScheme="primary" | ||
| variant="ghost" | ||
| onPress={() => handleOverDriveSettings(false)} | ||
| > | ||
| {getTermFromDictionary(language, 'close_window')} | ||
| </Button> | ||
| <Button | ||
| onPress={async () => { | ||
| await updateOverDriveEmail( | ||
| promptItemId, | ||
| promptSource, | ||
| promptPatronId, | ||
| overdriveEmail, | ||
| promptForOverdriveEmail, | ||
| libraryUrl | ||
| ).then((response) => { | ||
| showAlert(response); | ||
| }); | ||
| }} | ||
| > | ||
| {getTermFromDictionary(language, 'place_hold')} | ||
| </Button> | ||
| </Button.Group> | ||
| </Modal.Footer> | ||
| </Modal.Content> | ||
| </Modal> | ||
| ); | ||
| return ( | ||
| <Modal isOpen={showOverDriveSettings} onClose={() => handleOverDriveSettings(false)} avoidKeyboard closeOnOverlayClick={false}> | ||
| <Modal.Content> | ||
| <Modal.CloseButton /> | ||
| <Modal.Header>{promptTitle}</Modal.Header> | ||
| <Modal.Body mt={4}> | ||
| <FormControl> | ||
| <Stack> | ||
| <FormControl.Label>{getTermFromDictionary(language, 'overdrive_email_field')}</FormControl.Label> | ||
| <Input autoCapitalize="none" autoCorrect={false} id="overdriveEmail" onChangeText={(text) => setEmail(text)} /> | ||
| <Checkbox value="yes" my={2} id="promptForOverdriveEmail" onChange={(isSelected) => setRememberPrompt(isSelected)}> | ||
| {getTermFromDictionary(language, 'remember_settings')} | ||
| </Checkbox> | ||
| </Stack> | ||
| </FormControl> | ||
| </Modal.Body> | ||
| <Modal.Footer> | ||
| <Button.Group space={2} size="md"> | ||
| <Button colorScheme="primary" variant="ghost" onPress={() => handleOverDriveSettings(false)}> | ||
| {getTermFromDictionary(language, 'close_window')} | ||
| </Button> | ||
| <Button | ||
| onPress={async () => { | ||
| await updateOverDriveEmail(promptItemId, promptSource, promptPatronId, overdriveEmail, promptForOverdriveEmail, libraryUrl, language).then((response) => { | ||
| showAlert(response); | ||
| }); | ||
| }}> | ||
| {getTermFromDictionary(language, 'place_hold')} | ||
| </Button> | ||
| </Button.Group> | ||
| </Modal.Footer> | ||
| </Modal.Content> | ||
| </Modal> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.