Skip to content

Commit

Permalink
Respect updates to default options
Browse files Browse the repository at this point in the history
  • Loading branch information
jonatanklosko committed Aug 28, 2022
1 parent d01632a commit 99537a7
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/ConfirmProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ const buildOptions = (defaultOptions, options) => {
};

const ConfirmProvider = ({ children, defaultOptions = {} }) => {
const [options, setOptions] = useState({ ...DEFAULT_OPTIONS, ...defaultOptions });
const [options, setOptions] = useState({});
const [resolveReject, setResolveReject] = useState([]);
const [resolve, reject] = resolveReject;

const confirm = useCallback((options = {}) => {
return new Promise((resolve, reject) => {
setOptions(buildOptions(defaultOptions, options));
setOptions(options);
setResolveReject([resolve, reject]);
});
}, []);
Expand Down Expand Up @@ -87,7 +87,7 @@ const ConfirmProvider = ({ children, defaultOptions = {} }) => {
</ConfirmContext.Provider>
<ConfirmationDialog
open={resolveReject.length === 2}
options={options}
options={buildOptions(defaultOptions, options)}
onClose={handleClose}
onCancel={handleCancel}
onConfirm={handleConfirm}
Expand Down
27 changes: 26 additions & 1 deletion test/useConfirm.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useState } from 'react';
import { render, fireEvent, waitForElementToBeRemoved } from '@testing-library/react'

import { ConfirmProvider, useConfirm } from '../src/index';
Expand Down Expand Up @@ -99,4 +99,29 @@ describe('useConfirm', () => {
expect(button.disabled).toBe(true);
expect(button.getAttribute('aria-label')).toEqual('Confirm');
});

test('respects updates to default options', () => {
function App() {
const [confirmationText, setConfirmationText] = useState("Yes");

return (
<ConfirmProvider defaultOptions={{ confirmationText }}>
<DeleteButton />
<button onClick={() => setConfirmationText("Ok")}>Change text</button>
</ConfirmProvider>
)
}

const { getByText, queryByText } = render(<App />);

fireEvent.click(getByText('Delete'));

expect(getByText('Yes')).toBeTruthy();
expect(queryByText('Ok')).toBeFalsy();

fireEvent.click(getByText('Change text'));

expect(queryByText('Yes')).toBeFalsy();
expect(getByText('Ok')).toBeTruthy();
});
});

0 comments on commit 99537a7

Please sign in to comment.