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.

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

fix(CodeSnippet): set number of closed and open rows #7826

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
feat (CodeSnippet) merged to head
Alphabetical - moved max above min
  • Loading branch information
Bill Guigue authored and Bill Guigue committed Mar 8, 2021
commit b7d0ff0679c2f4f583a9142b292175f802ce61dc
40 changes: 20 additions & 20 deletions packages/react/src/components/CodeSnippet/CodeSnippet-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,6 @@ const lightProp = () => ({
false
),
});
const minClosedNumberOfRowsProp = () => ({
minClosedNumberOfRows: number(
'minClosedNumberOfRows: Specify the minimum number of rows to be shown when in closed view',
3,
{ min: 1 }
),
});
const minExpandedNumberOfRowsProp = () => ({
minExpandedNumberOfRows: number(
'minExpandedNumberOfRows: Specify the minimum number of rows to be shown when in expanded view',
16,
{ min: 1 }
),
});
const maxClosedNumberOfRowsProp = () => ({
maxClosedNumberOfRows: number(
'maxClosedNumberOfRows: Specify the maximum number of rows to be shown when in closed view',
Expand All @@ -168,6 +154,20 @@ const maxExpandedNumberOfRowsProp = () => ({
{ min: 1 }
),
});
const minClosedNumberOfRowsProp = () => ({
minClosedNumberOfRows: number(
'minClosedNumberOfRows: Specify the minimum number of rows to be shown when in closed view',
3,
{ min: 1 }
),
});
const minExpandedNumberOfRowsProp = () => ({
minExpandedNumberOfRows: number(
'minExpandedNumberOfRows: Specify the minimum number of rows to be shown when in expanded view',
16,
{ min: 1 }
),
});
const onClickProp = () => ({
onClick: action('onClick'),
});
Expand Down Expand Up @@ -204,10 +204,10 @@ export const Inline = () => (
{...feedbackProp()}
{...hideCopyButtonProp()}
{...lightProp()}
// {...minClosedNumberOfRowsProp()}
// {...minExpandedNumberOfRowsProp()}
// {...maxClosedNumberOfRowsProp()}
// {...maxExpandedNumberOfRowsProp()}
// {...minClosedNumberOfRowsProp()}
// {...minExpandedNumberOfRowsProp()}
{...onClickProp()}
// {...showLessTextProp()}
// {...showMoreTextProp()}
Expand All @@ -227,10 +227,10 @@ export const Single = () => (
{...feedbackProp()}
{...hideCopyButtonProp()}
{...lightProp()}
// {...minClosedNumberOfRowsProp()}
// {...minExpandedNumberOfRowsProp()}
// {...maxClosedNumberOfRowsProp()}
// {...maxExpandedNumberOfRowsProp()}
// {...minClosedNumberOfRowsProp()}
// {...minExpandedNumberOfRowsProp()}
{...onClickProp()}
// {...showLessTextProp()}
// {...showMoreTextProp()}
Expand All @@ -250,10 +250,10 @@ export const Multi = () => (
{...feedbackProp()}
{...hideCopyButtonProp()}
{...lightProp()}
{...minClosedNumberOfRowsProp()}
{...minExpandedNumberOfRowsProp()}
{...maxClosedNumberOfRowsProp()}
{...maxExpandedNumberOfRowsProp()}
{...minClosedNumberOfRowsProp()}
{...minExpandedNumberOfRowsProp()}
{...onClickProp()}
{...showLessTextProp()}
{...showMoreTextProp()}
Expand Down
30 changes: 15 additions & 15 deletions packages/react/src/components/CodeSnippet/CodeSnippet.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import getUniqueId from '../../tools/uniqueId';

const { prefix } = settings;

const defaultMinClosedNumberOfRows = 3;
const defaultMinExpandedNumberOfRows = 16;
const defaultMaxClosedNumberOfRows = 15;
const defaultMaxExpandedNumberOfRows = 30;
const defaultMinClosedNumberOfRows = 3;
const defaultMinExpandedNumberOfRows = 16;
const defaultShowLessText = 'Show less';
const defaultShowMoreText = 'Show more';
const defaultType = 'single';
Expand All @@ -40,10 +40,10 @@ function CodeSnippet({
feedback,
hideCopyButton,
light,
minClosedNumberOfRows = defaultMinClosedNumberOfRows,
minExpandedNumberOfRows = defaultMinExpandedNumberOfRows,
maxClosedNumberOfRows = defaultMaxClosedNumberOfRows,
maxExpandedNumberOfRows = defaultMaxExpandedNumberOfRows,
minClosedNumberOfRows = defaultMinClosedNumberOfRows,
minExpandedNumberOfRows = defaultMinExpandedNumberOfRows,
onClick,
showLessText = defaultShowLessText,
showMoreText = defaultShowMoreText,
Expand Down Expand Up @@ -173,12 +173,12 @@ function CodeSnippet({
? {}
: {
style: {
'minHeight':
(expandedCode ? minExpandedNumberOfRows : minClosedNumberOfRows) *
rowHeightInPixels,
'maxHeight':
(expandedCode ? maxExpandedNumberOfRows : maxClosedNumberOfRows) *
rowHeightInPixels,
'minHeight':
(expandedCode ? minExpandedNumberOfRows : minClosedNumberOfRows) *
rowHeightInPixels,
},
};

Expand Down Expand Up @@ -288,24 +288,24 @@ CodeSnippet.propTypes = {
light: PropTypes.bool,

/**
* Specify the minimum number of rows to be shown when in closed view
* Specify the maximum number of rows to be shown when in closed view
*/
minClosedNumberOfRows: PropTypes.number,
maxClosedNumberOfRows: PropTypes.number,

/**
* Specify the minimum number of rows to be shown when in expanded view
* Specify the maximum number of rows to be shown when in expanded view
*/
minExpandedNumberOfRows: PropTypes.number,
maxExpandedNumberOfRows: PropTypes.number,

/**
* Specify the maximum number of rows to be shown when in closed view
* Specify the minimum number of rows to be shown when in closed view
*/
maxClosedNumberOfRows: PropTypes.number,
minClosedNumberOfRows: PropTypes.number,

/**
* Specify the maximum number of rows to be shown when in expanded view
* Specify the minimum number of rows to be shown when in expanded view
*/
maxExpandedNumberOfRows: PropTypes.number,
minExpandedNumberOfRows: PropTypes.number,

/**
* An optional handler to listen to the `onClick` even fired by the Copy Button
Expand Down