Skip to content

fix(pf3): datetimepickers buttons do not show texts #263

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
Hyperkid123 merged 1 commit into from
Dec 10, 2019
Merged

fix(pf3): datetimepickers buttons do not show texts #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions packages/pf3-component-mapper/src/form-fields/date-time-picker/intervals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import { Icon } from 'patternfly-react';

export const PrevInterval = (props) => <td { ...props } >
<Icon name="angle-left" aria-label="Prev interval" />
</td>;

export const NextInterval = (props) => <td { ...props } >
<Icon name="angle-right" aria-label="Next interval" />
</td>;
10 changes: 3 additions & 7 deletions packages/pf3-component-mapper/src/form-fields/date-time-picker/navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Icon } from 'patternfly-react';
import MomentLocaleUtils from 'react-day-picker/moment';
import './date-picker-styles.scss';
import { NextInterval, PrevInterval } from './intervals';

const Navbar = ({ onNextClick, onPreviousClick, month, onMonthClick, isYear, toggleSelectingYear, locale, disablePrev, disableNext }) => (
<table className="year-interval-header">
<tbody>
<tr>
<td className={ disablePrev ? 'disabled' : '' } onMouseDown={ () => !disablePrev && onPreviousClick() }>
<Icon name="angle-left"><span>Prev interval</span></Icon>
</td>
<PrevInterval className={ disablePrev ? 'disabled' : '' } onMouseDown={ () => !disablePrev && onPreviousClick() }/>
<td>
{ isYear
? <button className="navbar-center-button" type="button" onClick={ () => toggleSelectingYear(true) }>{ month.getFullYear() }</button>
Expand All @@ -24,9 +22,7 @@ const Navbar = ({ onNextClick, onPreviousClick, month, onMonthClick, isYear, tog
</button>
) }
</td>
<td className={ disableNext ? 'disabled' : '' } onMouseDown={ () =>!disableNext && onNextClick() }>
<Icon name="angle-right" ><span>Next interval</span></Icon>
</td>
<NextInterval className={ disableNext ? 'disabled' : '' } onMouseDown={ () =>!disableNext && onNextClick() }/>
</tr>
</tbody>
</table>
Expand Down
10 changes: 3 additions & 7 deletions packages/pf3-component-mapper/src/form-fields/date-time-picker/year-selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import React from 'react';
import { Icon } from 'patternfly-react';
import PropTypes from 'prop-types';
import './date-picker-styles.scss';
import { PrevInterval, NextInterval } from './intervals';

const YearIntervalSelector = ({ currentInterval, prevInterval, nextInterval }) => (
<table className="year-interval-header">
<tbody>
<tr>
<td onClick={ prevInterval }>
<Icon name="angle-left"><span>Prev interval</span></Icon>
</td>
<PrevInterval onClick={ prevInterval }/>
<td>
<button className="year-interval-button" disabled>{ `${currentInterval[0]} - ${currentInterval[1]}` }</button>
</td>
<td onClick={ nextInterval }>
<Icon name="angle-right" ><span>Next interval</span></Icon>
</td>
<NextInterval onClick={ nextInterval }/>
</tr>
</tbody>
</table>
Expand Down
66 changes: 36 additions & 30 deletions ...nt-mapper/src/tests/form-fields/date-time-picker/__snapshots__/year-selector.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,30 @@ exports[`<YearSelector /> should render correctly 1`] = `
>
<tbody>
<tr>
<td
<PrevInterval
onClick={[Function]}
>
<Icon
name="angle-left"
type="fa"
<td
onClick={[Function]}
>
<FontAwesome
<Icon
aria-label="Prev interval"
name="angle-left"
type="fa"
>
<span
aria-hidden={true}
className="fa fa-angle-left"
<FontAwesome
aria-label="Prev interval"
name="angle-left"
>
<span>
Prev interval
</span>
</span>
</FontAwesome>
</Icon>
</td>
<span
aria-hidden={true}
aria-label="Prev interval"
className="fa fa-angle-left"
/>
</FontAwesome>
</Icon>
</td>
</PrevInterval>
<td>
<button
className="year-interval-button"
Expand All @@ -58,27 +61,30 @@ exports[`<YearSelector /> should render correctly 1`] = `
2000 - 2019
</button>
</td>
<td
<NextInterval
onClick={[Function]}
>
<Icon
name="angle-right"
type="fa"
<td
onClick={[Function]}
>
<FontAwesome
<Icon
aria-label="Next interval"
name="angle-right"
type="fa"
>
<span
aria-hidden={true}
className="fa fa-angle-right"
<FontAwesome
aria-label="Next interval"
name="angle-right"
>
<span>
Next interval
</span>
</span>
</FontAwesome>
</Icon>
</td>
<span
aria-hidden={true}
aria-label="Next interval"
className="fa fa-angle-right"
/>
</FontAwesome>
</Icon>
</td>
</NextInterval>
</tr>
</tbody>
</table>
Expand Down