Skip to content

936558: Resolved the conflict for JS and TS docs #503

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

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8f8ef1d
Integrated latest changes at 01-31-2025 1:30:07 PM
SyncfusionBuild Jan 31, 2025
26d8d3c
Integrated latest changes at 02-05-2025 1:30:59 PM
SyncfusionBuild Feb 5, 2025
fa94def
Integrated latest changes at 02-06-2025 1:30:19 PM
SyncfusionBuild Feb 6, 2025
78cffb5
Integrated latest changes at 02-07-2025 1:33:22 PM
SyncfusionBuild Feb 7, 2025
d8640a0
Integrated latest changes at 02-10-2025 1:30:21 PM
SyncfusionBuild Feb 10, 2025
7596a69
Integrated latest changes at 02-11-2025 1:30:16 PM
SyncfusionBuild Feb 11, 2025
e226eb5
Integrated latest changes at 02-13-2025 1:30:35 PM
SyncfusionBuild Feb 13, 2025
e82b5f6
Integrated latest changes at 02-14-2025 1:30:28 PM
SyncfusionBuild Feb 14, 2025
19f27af
Integrated latest changes at 02-15-2025 1:30:19 PM
SyncfusionBuild Feb 15, 2025
b2987bb
Integrated latest changes at 02-19-2025 1:30:12 PM
SyncfusionBuild Feb 19, 2025
1a71da3
Integrated latest changes at 02-20-2025 1:30:06 PM
SyncfusionBuild Feb 20, 2025
3ab60ad
Integrated latest changes at 02-21-2025 2:01:25 PM
SyncfusionBuild Feb 21, 2025
af535ea
Integrated latest changes at 02-22-2025 1:35:56 PM
SyncfusionBuild Feb 22, 2025
d67d693
Integrated latest changes at 02-24-2025 1:30:31 PM
SyncfusionBuild Feb 24, 2025
2769624
Integrated latest changes at 02-26-2025 1:30:19 PM
SyncfusionBuild Feb 26, 2025
b68483e
Integrated latest changes at 02-27-2025 1:30:19 PM
SyncfusionBuild Feb 27, 2025
fa7aa80
Integrated latest changes at 02-28-2025 1:30:44 PM
SyncfusionBuild Feb 28, 2025
060de63
Integrated latest changes at 03-05-2025 1:30:17 PM
SyncfusionBuild Mar 5, 2025
9619d74
Integrated latest changes at 03-06-2025 1:30:20 PM
SyncfusionBuild Mar 6, 2025
1ad92db
Integrated latest changes at 03-07-2025 1:30:11 PM
SyncfusionBuild Mar 7, 2025
4c19ecf
Integrated latest changes at 03-10-2025 1:30:18 PM
SyncfusionBuild Mar 10, 2025
f390c02
Integrated latest changes at 03-11-2025 1:30:16 PM
SyncfusionBuild Mar 11, 2025
09ad40d
Integrated latest changes at 03-12-2025 1:30:07 PM
SyncfusionBuild Mar 12, 2025
287d247
Integrated latest changes at 03-13-2025 1:30:09 PM
SyncfusionBuild Mar 13, 2025
3d535ef
Integrated latest changes at 03-14-2025 1:30:16 PM
SyncfusionBuild Mar 14, 2025
409eb01
Integrated latest changes at 03-15-2025 1:30:41 PM
SyncfusionBuild Mar 15, 2025
ce30f8f
Integrated latest changes at 03-17-2025 1:30:16 PM
SyncfusionBuild Mar 17, 2025
a209213
Integrated latest changes at 03-18-2025 1:30:26 PM
SyncfusionBuild Mar 18, 2025
6d7b6d7
Integrated latest changes at 03-18-2025 5:57:14 PM
SyncfusionBuild Mar 18, 2025
2bb97da
Integrated latest changes at 03-19-2025 1:30:20 PM
SyncfusionBuild Mar 19, 2025
556abff
Integrated latest changes at 03-20-2025 1:30:28 PM
SyncfusionBuild Mar 20, 2025
7a8aa5e
Integrated latest changes at 03-21-2025 1:30:18 PM
SyncfusionBuild Mar 21, 2025
33cb51e
Integrated latest changes at 03-22-2025 1:30:22 PM
SyncfusionBuild Mar 22, 2025
dabbec6
Integrated latest changes at 03-24-2025 1:30:13 PM
SyncfusionBuild Mar 24, 2025
4772f79
Integrated latest changes at 03-24-2025 5:28:40 PM
SyncfusionBuild Mar 24, 2025
bad6669
948994: resolved the conflict
elayabharathi-sf4336 Mar 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 25 additions & 9 deletions ej2-javascript-toc.html
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
<ul>
<li><a href="/ej2-javascript/chips/getting-started">Getting started</a></li>
<li><a href="/ej2-javascript/chips/types">Types</a></li>
<li><a href="/ej2-javascript/chips/draganddrop">Drag and Drop</a></li>
<li><a href="/ej2-javascript/chips/customization">Customization</a></li>
<li><a href="/ej2-javascript/chips/style">CSS Structure</a></li>
<li><a href="/ej2-javascript/chips/accessibility">Accessibility</a></li>
Expand Down Expand Up @@ -683,8 +684,10 @@
<li><a href="/ej2-javascript/data/data-binding">Data Binding</a></li>
<li><a href="/ej2-javascript/data/adaptors">Adaptors</a></li>
<li><a href="/ej2-javascript/data/querying">Querying</a></li>
<li><a href="/ej2-javascript/data/cache">Cache</a></li>
<li><a href="/ej2-javascript/data/manipulation">CRUD Data operations</a></li>
<li><a href="/ej2-javascript/data/dataManager-persistence">State Persistence</a></li>
<li><a href="/ej2-javascript/data/applying-middleware-logic">Applying Middleware Logic</a></li>
<li><a href="/ej2-javascript/data/how-to">How To</a></li>
<li><a href="https://ej2.syncfusion.com/javascript/documentation/api/data/overview/">API Reference</a></li>
</ul>
Expand Down Expand Up @@ -1489,19 +1492,19 @@
<li><a href="/ej2-javascript/image-editor/end-user-capabilities">End User Capabilities</a></li>
<li><a href="/ej2-javascript/image-editor/open-save">Open and Save</a></li>
<li><a href="/ej2-javascript/image-editor/selection-cropping">Selection and Cropping</a></li>
<li><a href="/ej2-javascript/image-editor/annotation">Annotation</a></li>
<li><a href="/ej2-javascript/image-editor/transform">Transform</a></li>
<li><a href="/ej2-javascript/image-editor/toolbar">Toolbar</a></li>
<li><a href="/ej2-javascript/image-editor/localization">Localization</a></li>
<li><a href="/ej2-javascript/image-editor/filter">Filter</a></li>
<li><a href="/ej2-javascript/image-editor/annotation">Annotation</a></li>
<li><a href="/ej2-javascript/image-editor/z-order">Z-Order</a></li>
<li><a href="/ej2-javascript/image-editor/quick-access">Quick Access Toolbar</a></li>
<li><a href="/ej2-javascript/image-editor/finetune">Finetune</a></li>
<li><a href="/ej2-javascript/image-editor/filter">Filter</a></li>
<li><a href="/ej2-javascript/image-editor/frame">Frame</a></li>
<li><a href="/ej2-javascript/image-editor/resize">Resize</a></li>
<li><a href="/ej2-javascript/image-editor/quick-access">Quick Access Toolbar</a></li>
<li><a href="/ej2-javascript/image-editor/undo-redo">Undo Redo</a></li>
<li><a href="/ej2-javascript/image-editor/z-order">Z-Order</a></li>
<li><a href="/ej2-javascript/image-editor/redact">Redact</a></li>
<li><a href="/ej2-javascript/image-editor/undo-redo">Undo Redo</a></li>
<li><a href="/ej2-javascript/image-editor/image-restrictions">Image Restrictions</a></li>
<li><a href="/ej2-javascript/image-editor/toolbar">Toolbar</a></li>
<li><a href="/ej2-javascript/image-editor/localization">Localization</a></li>
<li><a href="/ej2-javascript/image-editor/accessibility">Accessibility</a></li>
<li>How To
<ul>
Expand Down Expand Up @@ -2096,6 +2099,7 @@
<li><a href="/ej2-javascript/pivotview/how-to/bind-complex-data-to-the-pivot-table">Convert complex JSON to flat JSON and assign it to the pivot table</a></li>
<li><a href="/ej2-javascript/pivotview/how-to/load-pre-defined-report-in-initial-rendering">Load desired report from the report list as default</a></li>
<li><a href="/ej2-javascript/pivotview/how-to/display-value-in-hrs-min-sec-format">Display string value to pivot table values</a></li>
<li><a href="/ej2-javascript/pivotview/how-to/configuring-the-pivotview-control-minimum-width">Configuring the minimum width in the pivot table control</a></li>
</ul>
</li>
<li><a href="https://ej2.syncfusion.com/javascript/documentation/api/pivotview">API Reference</a></li>
Expand Down Expand Up @@ -2319,8 +2323,8 @@
<li><a href="/ej2-javascript/rich-text-editor/accessibility">Accessibility</a></li>
<li>How To
<ul>
<li><a href="/ej2-javascript/rich-text-editor/how-to/richtexteditor-inside-dialog">Integrating Rich Text Editor in Dialog Components</a></li>
<li><a href="/ej2-javascript/rich-text-editor/how-to/richtexteditor-inside-tab">Integrating Rich Text Editor in Tab Components</a></li>
<li><a href="/ej2-javascript/rich-text-editor/how-to/richtexteditor-inside-dialog">Integrating Rich Text Editor in Dialog Control</a></li>
<li><a href="/ej2-javascript/rich-text-editor/how-to/richtexteditor-inside-tab">Integrating Rich Text Editor in Tab Control</a></li>
<li><a href="/ej2-javascript/rich-text-editor/how-to/default-font">Change default font-family</a></li>
<li><a href="/ej2-javascript/rich-text-editor/how-to/file-size">Check image size</a></li>
<li><a href="/ej2-javascript/rich-text-editor/how-to/shortcut-key">Customize shortcut keys</a></li>
Expand Down Expand Up @@ -2487,6 +2491,18 @@
<li><a href="/ej2-javascript/sparkline/ej1-api-migration">Migration from Essential JS 1</a></li>
<li><a href="https://ej2.syncfusion.com/javascript/documentation/api/sparkline/">API Reference</a></li>
</ul>
</li><li>Speech To Text
<ul>
<li><a href="/ej2-javascript/speech-to-text/es5-getting-started">Getting Started</a></li>
<li><a href="/ej2-javascript/speech-to-text/speech-recognition">Speech recognition</a></li>
<li><a href="/ej2-javascript/speech-to-text/appearance">Appearance</a></li>
<li><a href="/ej2-javascript/speech-to-text/globalization">Globalization</a></li>
<li><a href="/ej2-javascript/speech-to-text/accessibility">Accessibility</a></li>
<li><a href="/ej2-javascript/speech-to-text/security">Security concerns</a></li>
<li><a href="/ej2-javascript/speech-to-text/methods">Methods</a></li>
<li><a href="/ej2-javascript/speech-to-text/events">Events</a></li>
<li><a href="https://ej2.syncfusion.com/javascript/documentation/api/speech-to-text/">API Reference</a></li>
</ul>
</li><li>
SpeedDial
<ul>
Expand Down
66 changes: 66 additions & 0 deletions ej2-javascript/accumulation-chart/funnel.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,72 @@ Individual points can be customized using the `pointRender` event.
{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs24" %}
{% endif %}

## Mode

The Funnel chart supports both Standard and Trapezoidal modes of rendering. The default value of the `funnelMode` is `Standard`.

### Standard Mode

The `Standard` funnel mode follows the traditional funnel shape, with the width continuously narrowing down to a point at the bottom.

{% if page.publishingplatform == "typescript" %}

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/chart/chart-types-cs495/index.ts %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs495/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs495" %}

{% elsif page.publishingplatform == "javascript" %}

{% tabs %}
{% highlight js tabtitle="index.js" %}
{% include code-snippet/chart/chart-types-cs495/index.js %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs495/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs495" %}
{% endif %}

### Trapezoidal Mode

The `Trapezoidal` mode is a modified funnel shape where the width narrows, but features a flattened or parallel section near the top, creating a trapezoidal appearance. This mode helps compare different data points more clearly while maintaining a funnel-like structure.

{% if page.publishingplatform == "typescript" %}

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/chart/chart-types-cs489/index.ts %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs489/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs489" %}

{% elsif page.publishingplatform == "javascript" %}

{% tabs %}
{% highlight js tabtitle="index.js" %}
{% include code-snippet/chart/chart-types-cs489/index.js %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs489/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs489" %}
{% endif %}

## See also

* [Data label](./data-label)
Expand Down
62 changes: 62 additions & 0 deletions ej2-javascript/accumulation-chart/title-and-sub-title.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,37 @@ Accumulation Chart can be customizing a title using [`titleStyle`](../api/accumu
{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs63" %}
{% endif %}

### Position

The `position` property customizes the placement of the accumulation chart title. It supports the following options: `Right`, `Left`, `Bottom`, `Top`, and `Custom`. The Custom option allows you to position the title anywhere on the chart using x and y coordinates, providing flexible title alignment based on layout requirements.

{% if page.publishingplatform == "typescript" %}

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/chart/chart-types-cs496/index.ts %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs496/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs496" %}

{% elsif page.publishingplatform == "javascript" %}

{% tabs %}
{% highlight js tabtitle="index.js" %}
{% include code-snippet/chart/chart-types-cs496/index.js %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs496/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs496" %}
{% endif %}

## SubTitle

Accumulation Chart can be given a subtitle using [`subTitle`](../api/accumulation-chart/accumulationChartModel/#subtitle) property, to show the information about the data plotted.
Expand Down Expand Up @@ -134,3 +165,34 @@ Accumulation Chart can be customizing a subtitle using [`subTitleStyle`](../api/

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs65" %}
{% endif %}

### Position

The `position` property customizes the placement of the accumulation chart subtitle. It supports the following options: `Right`, `Left`, `Bottom`, `Top`, and `Custom`. The Custom option allows you to position the subtitle anywhere on the chart using x and y coordinates, providing flexible subtitle alignment based on layout requirements.

{% if page.publishingplatform == "typescript" %}

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/chart/chart-types-cs496/index.ts %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs496/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs496" %}

{% elsif page.publishingplatform == "javascript" %}

{% tabs %}
{% highlight js tabtitle="index.js" %}
{% include code-snippet/chart/chart-types-cs496/index.js %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs496/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs496" %}
{% endif %}
2 changes: 1 addition & 1 deletion ej2-javascript/bullet-chart/js/es5-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ var data = [
];
```

Now assign the local data to `dataSource` property. `value` and `target` values should be mapped with `valueName` and `targetName` respectively.
Now assign the local data to `dataSource` property. `value` and `target` values should be mapped with `valueField` and `targetField` respectively.

{% tabs %}
{% highlight js tabtitle="index.js" %}
Expand Down
2 changes: 1 addition & 1 deletion ej2-javascript/bullet-chart/ts/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ let data: any[] = [
{% endhighlight %}
{% endtabs %}

Now assign the local data to `dataSource` property. `value` and `target` values should be mapped with `valueName` and `targetName` respectively.
Now assign the local data to `dataSource` property. `value` and `target` values should be mapped with `valueField` and `targetField` respectively.

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
Expand Down
4 changes: 2 additions & 2 deletions ej2-javascript/chart/Chart-types/scatter.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ The [shape](../../api/chart/markerSettings/#shape) property allows you to custom
{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs351" %}
{% endif %}


**Border**

The [border](../../api/chart/series/#border) property allows you to customize the border of the series by defining its [color](../../api/chart/borderModel/#color), [width](../../api/chart/borderModel/#width), and [dashArray](../../api/chart/borderModel/#dasharray).
Expand All @@ -187,7 +188,7 @@ The [border](../../api/chart/series/#border) property allows you to customize th
{% include code-snippet/chart/chart-types-cs488/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs488" %}

{% elsif page.publishingplatform == "javascript" %}
Expand All @@ -204,7 +205,6 @@ The [border](../../api/chart/series/#border) property allows you to customize th
{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs488" %}
{% endif %}


## Empty points

Data points with `null` or `undefined` values are considered empty. Empty data points are ignored and not plotted on the chart.
Expand Down
77 changes: 77 additions & 0 deletions ej2-javascript/chart/Chart-types/stack-area.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,83 @@ The [`pointRender`](../../api/chart#pointrender) event allows you to customize e
{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs414" %}
{% endif %}

## Stack labels

The `stackLabels` in stacked charts display cumulative total values for stack segments directly using data labels. If a stacked point has negative values, the stack labels are displayed below the point.

{% if page.publishingplatform == "typescript" %}

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/chart/chart-types-cs491/index.ts %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs491/index.html %}
{% endhighlight %}
{% highlight ts tabtitle="datasource.ts" %}
{% include code-snippet/chart/chart-types-cs491/datasource.ts %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs491" %}

{% elsif page.publishingplatform == "javascript" %}

{% tabs %}
{% highlight js tabtitle="index.js" %}
{% include code-snippet/chart/chart-types-cs491/index.js %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs491/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs491" %}
{% endif %}

### Stack labels customization
Stack labels have various properties for customization to enhance the visual based on your requirements:

* `visible` - Specifies whether stack labels are visible. Setting to true will display the labels. Default is false.
* `fill` - Defines the background color of the stack labels. Accepts valid CSS color strings (hex, RGBA, etc.). Default is transparent.
* `format` - Formats the text displayed in the stack labels. Supports placeholders like {value}. Default is null.
* `angle` - Specifies the rotation angle for stack labels in degrees. Default is 0.
* `rx` - Defines the rounded corner radius along the X-axis (horizontal direction) for the stack label background. Default is 5.
* `ry` - Defines the rounded corner radius along the Y-axis (vertical direction) for the stack label background. Default is 5.
* `margin` - Configures the margin around the stack label (left, right, top, and bottom).
* `border` - Configures the appearance of the stack label's border.
* `font` - Customizes the stack label text, including font size, color, style, weight, and family.

{% if page.publishingplatform == "typescript" %}

{% tabs %}
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/chart/chart-types-cs491A/index.ts %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs491A/index.html %}
{% endhighlight %}
{% highlight ts tabtitle="datasource.ts" %}
{% include code-snippet/chart/chart-types-cs491A/datasource.ts %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs491A" %}

{% elsif page.publishingplatform == "javascript" %}

{% tabs %}
{% highlight js tabtitle="index.js" %}
{% include code-snippet/chart/chart-types-cs491A/index.js %}
{% endhighlight %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/chart/chart-types-cs491A/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/code-snippet/chart/chart-types-cs491A" %}
{% endif %}

## See also

* [Data label](../data-labels)
Expand Down
Loading