Skip to content

Commit 79ab790

Browse files
didix16didix16
committed
Merge branch 'master' of github.com:didix16/primereact
2 parents 524ab3a + fee2bdf commit 79ab790

File tree

56 files changed

+4436
-831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4436
-831
lines changed

‎components/doc/common/apidoc/index.json

-24
Original file line numberDiff line numberDiff line change
@@ -10029,14 +10029,6 @@
1002910029
"default": "",
1003010030
"description": "Used to get the child elements of the component."
1003110031
},
10032-
{
10033-
"name": "className",
10034-
"optional": true,
10035-
"readonly": false,
10036-
"type": "string",
10037-
"default": "",
10038-
"description": "Style class of the element."
10039-
},
1004010032
{
1004110033
"name": "data",
1004210034
"optional": true,
@@ -10053,14 +10045,6 @@
1005310045
"default": "",
1005410046
"description": "Height of the chart in non-responsive mode."
1005510047
},
10056-
{
10057-
"name": "id",
10058-
"optional": true,
10059-
"readonly": false,
10060-
"type": "string",
10061-
"default": "",
10062-
"description": "Unique identifier of the element."
10063-
},
1006410048
{
1006510049
"name": "options",
1006610050
"optional": true,
@@ -10093,14 +10077,6 @@
1009310077
"default": "",
1009410078
"description": "Used to configure passthrough(pt) options of the component."
1009510079
},
10096-
{
10097-
"name": "style",
10098-
"optional": true,
10099-
"readonly": false,
10100-
"type": "CSSProperties",
10101-
"default": "",
10102-
"description": "Inline style of the element."
10103-
},
1010410080
{
1010510081
"name": "type",
1010610082
"optional": true,

‎components/lib/chart/chart.d.ts

+1-13
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ export interface ChartPassThroughOptions {
4545
* Defines valid properties in Chart component.
4646
* @group Properties
4747
*/
48-
export interface ChartProps {
49-
/**
50-
* Unique identifier of the element.
51-
*/
52-
id?: string | undefined;
48+
export interface ChartProps extends Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'ref' | 'content' | 'pt'> {
5349
/**
5450
* Type of the chart.
5551
*/
@@ -74,14 +70,6 @@ export interface ChartProps {
7470
* Height of the chart in non-responsive mode.
7571
*/
7672
height?: string | undefined;
77-
/**
78-
* Inline style of the element.
79-
*/
80-
style?: React.CSSProperties | undefined;
81-
/**
82-
* Style class of the element.
83-
*/
84-
className?: string | undefined;
8573
/**
8674
* ARIA label for the chart canvas. Defaults to options.plugins.title.text if available.
8775
* @default options.plugins.title.text

‎components/lib/inputnumber/InputNumber.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,8 @@ export const InputNumber = React.memo(
672672
if (sign.isMinusSign) {
673673
const isNewMinusSign = minusCharIndex === -1;
674674

675-
if (isNewMinusSign && (selectionStart === 0 || selectionStart === currencyCharIndex + 1)) {
675+
// #6522 - Selected negative value can't be overwritten with a minus ('-') symbol
676+
if (selectionStart === 0 || selectionStart === currencyCharIndex + 1) {
676677
newValueStr = inputValue;
677678

678679
if (isNewMinusSign || selectionEnd !== 0) {

‎components/lib/tabview/TabViewBase.js

-80
Original file line numberDiff line numberDiff line change
@@ -23,85 +23,6 @@ const classes = {
2323
}
2424
};
2525

26-
const styles = `
27-
@layer primereact {
28-
.p-tabview-nav-container {
29-
position: relative;
30-
}
31-
32-
.p-tabview-scrollable .p-tabview-nav-container {
33-
overflow: hidden;
34-
}
35-
36-
.p-tabview-nav-content {
37-
overflow-x: auto;
38-
overflow-y: hidden;
39-
scroll-behavior: smooth;
40-
scrollbar-width: none;
41-
overscroll-behavior: contain auto;
42-
position: relative;
43-
}
44-
45-
.p-tabview-nav {
46-
display: flex;
47-
margin: 0;
48-
padding: 0;
49-
list-style-type: none;
50-
flex: 1 1 auto;
51-
}
52-
53-
.p-tabview-nav-link {
54-
cursor: pointer;
55-
user-select: none;
56-
display: flex;
57-
align-items: center;
58-
position: relative;
59-
text-decoration: none;
60-
overflow: hidden;
61-
}
62-
63-
.p-tabview-ink-bar {
64-
display: none;
65-
z-index: 1;
66-
}
67-
68-
.p-tabview-nav-link:focus {
69-
z-index: 1;
70-
}
71-
72-
.p-tabview-close {
73-
z-index: 1;
74-
}
75-
76-
.p-tabview-title {
77-
line-height: 1;
78-
white-space: nowrap;
79-
}
80-
81-
.p-tabview-nav-btn {
82-
position: absolute;
83-
top: 0;
84-
z-index: 2;
85-
height: 100%;
86-
display: flex;
87-
align-items: center;
88-
justify-content: center;
89-
}
90-
91-
.p-tabview-nav-prev {
92-
left: 0;
93-
}
94-
95-
.p-tabview-nav-next {
96-
right: 0;
97-
}
98-
99-
.p-tabview-nav-content::-webkit-scrollbar {
100-
display: none;
101-
}
102-
}
103-
`;
104-
10526
const inlineStyles = {
10627
tab: {
10728
header: ({ headerStyle, _style }) => ({ ...(headerStyle || {}), ...(_style || {}) }),
@@ -129,7 +50,6 @@ export const TabViewBase = ComponentBase.extend({
12950
},
13051
css: {
13152
classes,
132-
styles,
13353
inlineStyles
13454
}
13555
});

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"build:lib": "NODE_ENV=production INPUT_DIR=components/lib/ OUTPUT_DIR=dist/ npm run build:package",
1010
"build:package": "npm run build:check && rollup -c && gulp build-resources && npm run build:api",
1111
"dev:link": "NPM_LINK=true NODE_ENV=production INPUT_DIR=components/lib/ OUTPUT_DIR=dist/ npm run build:package:dev",
12-
"dev:link:windows": "set NPM_LINK=true && set NODE_ENV=production&& set INPUT_DIR=components/lib/&& set OUTPUT_DIR=dist/&& npm run build:package:dev",
13-
"build:package:dev": "npm run build:check && rollup -c --watch && gulp build-resources && npm run build:api",
12+
"dev:link:windows": "set \"NPM_LINK=true\" && set \"NODE_ENV=production\" && set \"INPUT_DIR=components/lib/\" && set \"OUTPUT_DIR=dist/\" && npm run build:package:dev",
13+
"build:package:dev": "npm run build:check && gulp build-resources && npm run build:api && rollup -c --watch",
1414
"build:api": "npm run apiwebtypes && npm run apidoc",
1515
"build:check": "npm run lint && npm run format:check && npm run type:check && npm run security:check",
1616
"security:check": "npm audit --production --audit-level high",

‎public/themes/arya-blue/theme.css

+62
Original file line numberDiff line numberDiff line change
@@ -4660,6 +4660,68 @@
46604660
outline-offset: 0;
46614661
box-shadow: 0 0 0 1px #93cbf9;
46624662
}
4663+
.p-tabview-nav-container {
4664+
position: relative;
4665+
}
4666+
.p-tabview-scrollable .p-tabview-nav-container {
4667+
overflow: hidden;
4668+
}
4669+
.p-tabview-nav-content {
4670+
overflow-x: auto;
4671+
overflow-y: hidden;
4672+
scroll-behavior: smooth;
4673+
scrollbar-width: none;
4674+
overscroll-behavior: contain auto;
4675+
position: relative;
4676+
}
4677+
.p-tabview-nav {
4678+
display: flex;
4679+
margin: 0;
4680+
padding: 0;
4681+
list-style-type: none;
4682+
flex: 1 1 auto;
4683+
}
4684+
.p-tabview-nav-link {
4685+
cursor: pointer;
4686+
user-select: none;
4687+
display: flex;
4688+
align-items: center;
4689+
position: relative;
4690+
text-decoration: none;
4691+
overflow: hidden;
4692+
}
4693+
.p-tabview-ink-bar {
4694+
display: none;
4695+
z-index: 1;
4696+
}
4697+
.p-tabview-nav-link:focus {
4698+
z-index: 1;
4699+
}
4700+
.p-tabview-close {
4701+
z-index: 1;
4702+
}
4703+
.p-tabview-title {
4704+
line-height: 1;
4705+
white-space: nowrap;
4706+
}
4707+
.p-tabview-nav-btn {
4708+
position: absolute;
4709+
top: 0;
4710+
z-index: 2;
4711+
height: 100%;
4712+
display: flex;
4713+
align-items: center;
4714+
justify-content: center;
4715+
}
4716+
.p-tabview-nav-prev {
4717+
left: 0;
4718+
}
4719+
.p-tabview-nav-next {
4720+
right: 0;
4721+
}
4722+
.p-tabview-nav-content::-webkit-scrollbar {
4723+
display: none;
4724+
}
46634725
.p-tabview .p-tabview-nav {
46644726
background: transparent;
46654727
border: 1px solid #383838;

‎public/themes/arya-green/theme.css

+62
Original file line numberDiff line numberDiff line change
@@ -4660,6 +4660,68 @@
46604660
outline-offset: 0;
46614661
box-shadow: 0 0 0 1px #a7d8a9;
46624662
}
4663+
.p-tabview-nav-container {
4664+
position: relative;
4665+
}
4666+
.p-tabview-scrollable .p-tabview-nav-container {
4667+
overflow: hidden;
4668+
}
4669+
.p-tabview-nav-content {
4670+
overflow-x: auto;
4671+
overflow-y: hidden;
4672+
scroll-behavior: smooth;
4673+
scrollbar-width: none;
4674+
overscroll-behavior: contain auto;
4675+
position: relative;
4676+
}
4677+
.p-tabview-nav {
4678+
display: flex;
4679+
margin: 0;
4680+
padding: 0;
4681+
list-style-type: none;
4682+
flex: 1 1 auto;
4683+
}
4684+
.p-tabview-nav-link {
4685+
cursor: pointer;
4686+
user-select: none;
4687+
display: flex;
4688+
align-items: center;
4689+
position: relative;
4690+
text-decoration: none;
4691+
overflow: hidden;
4692+
}
4693+
.p-tabview-ink-bar {
4694+
display: none;
4695+
z-index: 1;
4696+
}
4697+
.p-tabview-nav-link:focus {
4698+
z-index: 1;
4699+
}
4700+
.p-tabview-close {
4701+
z-index: 1;
4702+
}
4703+
.p-tabview-title {
4704+
line-height: 1;
4705+
white-space: nowrap;
4706+
}
4707+
.p-tabview-nav-btn {
4708+
position: absolute;
4709+
top: 0;
4710+
z-index: 2;
4711+
height: 100%;
4712+
display: flex;
4713+
align-items: center;
4714+
justify-content: center;
4715+
}
4716+
.p-tabview-nav-prev {
4717+
left: 0;
4718+
}
4719+
.p-tabview-nav-next {
4720+
right: 0;
4721+
}
4722+
.p-tabview-nav-content::-webkit-scrollbar {
4723+
display: none;
4724+
}
46634725
.p-tabview .p-tabview-nav {
46644726
background: transparent;
46654727
border: 1px solid #383838;

‎public/themes/arya-orange/theme.css

+62
Original file line numberDiff line numberDiff line change
@@ -4660,6 +4660,68 @@
46604660
outline-offset: 0;
46614661
box-shadow: 0 0 0 1px #ffe284;
46624662
}
4663+
.p-tabview-nav-container {
4664+
position: relative;
4665+
}
4666+
.p-tabview-scrollable .p-tabview-nav-container {
4667+
overflow: hidden;
4668+
}
4669+
.p-tabview-nav-content {
4670+
overflow-x: auto;
4671+
overflow-y: hidden;
4672+
scroll-behavior: smooth;
4673+
scrollbar-width: none;
4674+
overscroll-behavior: contain auto;
4675+
position: relative;
4676+
}
4677+
.p-tabview-nav {
4678+
display: flex;
4679+
margin: 0;
4680+
padding: 0;
4681+
list-style-type: none;
4682+
flex: 1 1 auto;
4683+
}
4684+
.p-tabview-nav-link {
4685+
cursor: pointer;
4686+
user-select: none;
4687+
display: flex;
4688+
align-items: center;
4689+
position: relative;
4690+
text-decoration: none;
4691+
overflow: hidden;
4692+
}
4693+
.p-tabview-ink-bar {
4694+
display: none;
4695+
z-index: 1;
4696+
}
4697+
.p-tabview-nav-link:focus {
4698+
z-index: 1;
4699+
}
4700+
.p-tabview-close {
4701+
z-index: 1;
4702+
}
4703+
.p-tabview-title {
4704+
line-height: 1;
4705+
white-space: nowrap;
4706+
}
4707+
.p-tabview-nav-btn {
4708+
position: absolute;
4709+
top: 0;
4710+
z-index: 2;
4711+
height: 100%;
4712+
display: flex;
4713+
align-items: center;
4714+
justify-content: center;
4715+
}
4716+
.p-tabview-nav-prev {
4717+
left: 0;
4718+
}
4719+
.p-tabview-nav-next {
4720+
right: 0;
4721+
}
4722+
.p-tabview-nav-content::-webkit-scrollbar {
4723+
display: none;
4724+
}
46634725
.p-tabview .p-tabview-nav {
46644726
background: transparent;
46654727
border: 1px solid #383838;

0 commit comments

Comments
 (0)